gmake: Revert dir.c r.1.2.
> gmake: Make this work with glibc glob interface v2 > > http://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81 Don't apply an imcompatible license patch. Reported by kamil@n.o.
This commit is contained in:
parent
b2a8932dbe
commit
f39e32fc5f
|
@ -1194,32 +1194,6 @@ local_stat (const char *path, struct stat *buf)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Similarly for lstat. */
|
|
||||||
#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
|
|
||||||
# ifndef VMS
|
|
||||||
# ifndef HAVE_SYS_STAT_H
|
|
||||||
int lstat (const char *path, struct stat *sbuf);
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
/* We are done with the fake lstat. Go back to the real lstat */
|
|
||||||
# ifdef lstat
|
|
||||||
# undef lstat
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
# define local_lstat lstat
|
|
||||||
#elif defined(WINDOWS32)
|
|
||||||
/* Windows doesn't support lstat(). */
|
|
||||||
# define local_lstat local_stat
|
|
||||||
#else
|
|
||||||
static int
|
|
||||||
local_lstat (const char *path, struct stat *buf)
|
|
||||||
{
|
|
||||||
int e;
|
|
||||||
EINTRLOOP (e, lstat (path, buf));
|
|
||||||
return e;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void
|
void
|
||||||
dir_setup_glob (glob_t *gl)
|
dir_setup_glob (glob_t *gl)
|
||||||
{
|
{
|
||||||
|
@ -1227,8 +1201,9 @@ dir_setup_glob (glob_t *gl)
|
||||||
gl->gl_opendir = open_dirstream;
|
gl->gl_opendir = open_dirstream;
|
||||||
gl->gl_readdir = read_dirstream;
|
gl->gl_readdir = read_dirstream;
|
||||||
gl->gl_closedir = ansi_free;
|
gl->gl_closedir = ansi_free;
|
||||||
gl->gl_lstat = local_lstat;
|
|
||||||
gl->gl_stat = local_stat;
|
gl->gl_stat = local_stat;
|
||||||
|
/* We don't bother setting gl_lstat, since glob never calls it.
|
||||||
|
The slot is only there for compatibility with 4.4 BSD. */
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue