1 From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
2 From: Paul Eggert <eggert@cs.ucla.edu>
3 Date: Sun, 24 Sep 2017 09:12:58 -0400
4 Subject: glob: Do not assume glibc glob internals.
6 It has been proposed that glibc glob start using gl_lstat,
7 which the API allows it to do. GNU 'make' should not get in
9 https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
11 * dir.c (local_lstat): New function, like local_stat.
12 (dir_setup_glob): Use it to initialize gl_lstat too, as the API
15 dir.c | 29 +++++++++++++++++++++++++++--
16 1 file changed, 27 insertions(+), 2 deletions(-)
18 diff --git a/dir.c b/dir.c
19 index adbb8a9..c343e4c 100644
22 @@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
26 +/* Similarly for lstat. */
27 +#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
29 +# ifndef HAVE_SYS_STAT_H
30 +int lstat (const char *path, struct stat *sbuf);
33 + /* We are done with the fake lstat. Go back to the real lstat */
38 +# define local_lstat lstat
39 +#elif defined(WINDOWS32)
40 +/* Windows doesn't support lstat(). */
41 +# define local_lstat local_stat
44 +local_lstat (const char *path, struct stat *buf)
47 + EINTRLOOP (e, lstat (path, buf));
53 dir_setup_glob (glob_t *gl)
55 gl->gl_opendir = open_dirstream;
56 gl->gl_readdir = read_dirstream;
57 gl->gl_closedir = free;
58 + gl->gl_lstat = local_lstat;
59 gl->gl_stat = local_stat;
60 - /* We don't bother setting gl_lstat, since glob never calls it.
61 - The slot is only there for compatibility with 4.4 BSD. */