Re: [PATCH] Do not assume glibc glob internals

[Paul Smith]

On Sat, 2017-09-23 at 23:27 -0700, Paul Eggert wrote:
> Yes, that sounds right. I copied that boilerplate from local_stat, so 
> local_stat 
> could be simplified too.

This is what I applied.  Thanks!

commit e069300c3a1170285b050cc6543f7d32e5b0993e
Author: Paul Eggert <address@hidden>
Date:   Sun Sep 24 09:12:58 2017 -0400

    glob: Do not assume glibc glob internals.
    
    It has been proposed that glibc glob start using gl_lstat,
    which the API allows it to do.  GNU 'make' should not get in
    the way of this.  See:
    https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
    
    * dir.c (local_lstat): New function, like local_stat.
    (dir_setup_glob): Use it to initialize gl_lstat too, as the API
    requires.

diff --git a/dir.c b/dir.c
index adbb8a9..261b768 100644
--- a/dir.c
+++ b/dir.c
@@ -1299,15 +1299,53 @@ 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
+#else
+static int
+local_lstat (const char *path, struct stat *buf)
+{
+  int e;
+  EINTRLOOP (e, lstat (path, buf));
+
+#ifdef WINDOWS32
+  if (e == 0)
+    {
+      size_t plen = strlen (path);
+
+      /* If path ends in /. make sure it is a directory.  This is because
+         'lstat' on Windows normalizes the argument foo/. => foo without
+         checking first that foo is a directory.  */
+      if (plen > 1 && path[plen - 1] == '.'
+          && (path[plen - 2] == '/' || path[plen - 2] == '\\')
+          && !_S_ISDIR (buf->st_mode))
+        return -1;
+    }
+#endif
+
+  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