mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-13 18:36:14 -05:00
53 lines
1.3 KiB
Diff
53 lines
1.3 KiB
Diff
|
Work with the new glob interface in glibc 2.27.
|
||
|
|
|
||
|
|
Taken from this upstream commit:
|
||
|
|
https://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
|
||
|
|
|
||
|
|
diff --git a/dir.c b/dir.c
|
||
|
|
index adbb8a9..c343e4c 100644
|
||
|
|
--- a/dir.c
|
||
|
|
+++ b/dir.c
|
||
|
|
@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
|
||
|
|
}
|
||
|
|
#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
|
||
|
|
dir_setup_glob (glob_t *gl)
|
||
|
|
{
|
||
|
|
gl->gl_opendir = open_dirstream;
|
||
|
|
gl->gl_readdir = read_dirstream;
|
||
|
|
gl->gl_closedir = free;
|
||
|
|
+ gl->gl_lstat = local_lstat;
|
||
|
|
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
|