-mautoupdate

[gnulib.git] / lib / glob.c

diff --git a/lib/glob.c b/lib/glob.c
index 97399c4..42cd39b 100644 (file)
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007
+/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -32,6 +32,8 @@
 /* #define NDEBUG 1 */
 #include <assert.h>
 
+#include <stdbool.h>
+
 #include <stdio.h>             /* Needed on stupid SunOS for assert.  */
 
 #if !defined _LIBC || !defined GLOB_ONLY_P
@@ -41,7 +43,13 @@
 # define POSIX
 #endif
 
-#include <pwd.h>
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WINDOWS32
+#endif
+
+#ifndef WINDOWS32
+# include <pwd.h>
+#endif
 
 #include <errno.h>
 #ifndef __set_errno
@@ -134,6 +142,7 @@
 # define struct_stat64         struct stat64
 #else /* !_LIBC */
 # define __stat64(fname, buf)  stat (fname, buf)
+# define __fxstatat64(_, d, f, st, flag) fstatat (d, f, st, flag)
 # define struct_stat64         struct stat
 # define __stat(fname, buf)    stat (fname, buf)
 # define __alloca              alloca
@@ -142,7 +151,6 @@
 # define __glob_pattern_p      glob_pattern_p
 #endif /* _LIBC */
 
-#include <stdbool.h>
 #include <fnmatch.h>
 
 #ifdef _SC_GETPW_R_SIZE_MAX
@@ -178,7 +186,10 @@ static const char *next_brace_sub (const char *begin, int flags) __THROW;
 
 #ifndef _LIBC
 /* The results of opendir() in this file are not used with dirfd and fchdir,
-   therefore save some unnecessary work in fchdir.c.  */
+   and we do not leak fds to any single-threaded code that could use stdio,
+   therefore save some unnecessary recursion in fchdir.c and opendir_safer.c.
+   FIXME - if the kernel ever adds support for multi-thread safety for
+   avoiding standard fds, then we should use opendir_safer.  */
 # undef opendir
 # undef closedir
 
@@ -559,8 +570,26 @@ glob (pattern, flags, errfunc, pglob)
            home_dir = "SYS:";
 # else
 #  ifdef WINDOWS32
+         /* Windows NT defines HOMEDRIVE and HOMEPATH.  But give preference
+            to HOME, because the user can change HOME.  */
          if (home_dir == NULL || home_dir[0] == '\0')
-            home_dir = "c:/users/default"; /* poor default */
+           {
+             const char *home_drive = getenv ("HOMEDRIVE");
+             const char *home_path = getenv ("HOMEPATH");
+
+             if (home_drive != NULL && home_path != NULL)
+               {
+                 size_t home_drive_len = strlen (home_drive);
+                 size_t home_path_len = strlen (home_path);
+                 char *mem = alloca (home_drive_len + home_path_len + 1);
+
+                 memcpy (mem, home_drive, home_drive_len);
+                 memcpy (mem + home_drive_len, home_path, home_path_len + 1);
+                 home_dir = mem;
+               }
+             else
+               home_dir = "c:/users/default"; /* poor default */
+           }
 #  else
          if (home_dir == NULL || home_dir[0] == '\0')
            {
@@ -1213,14 +1242,14 @@ weak_alias (__glob_pattern_p, glob_pattern_p)
 #endif /* !GLOB_ONLY_P */
 
 
+#if !defined _LIBC || !defined GLOB_ONLY_P
 /* We put this in a separate function mainly to allow the memory
    allocated with alloca to be recycled.  */
-#if !defined _LIBC || !defined GLOB_ONLY_P
 static int
 __attribute_noinline__
 link_exists2_p (const char *dir, size_t dirlen, const char *fname,
-              glob_t *pglob
-# ifndef _LIBC
+               glob_t *pglob
+# if !defined _LIBC && !HAVE_FSTATAT
                , int flags
 # endif
                )
@@ -1228,31 +1257,37 @@ link_exists2_p (const char *dir, size_t dirlen, const char *fname,
   size_t fnamelen = strlen (fname);
   char *fullname = __alloca (dirlen + 1 + fnamelen + 1);
   struct stat st;
-# ifndef _LIBC
-  struct_stat64 st64;
-# endif
 
   mempcpy (mempcpy (mempcpy (fullname, dir, dirlen), "/", 1),
           fname, fnamelen + 1);
 
-# ifdef _LIBC
-  return (*pglob->gl_stat) (fullname, &st) == 0;
-# else
-  return ((__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
-          ? (*pglob->gl_stat) (fullname, &st)
-          : __stat64 (fullname, &st64)) == 0);
+# if !defined _LIBC && !HAVE_FSTATAT
+  if (__builtin_expect ((flags & GLOB_ALTDIRFUNC) == 0, 1))
+    {
+      struct_stat64 st64;
+      return __stat64 (fullname, &st64) == 0;
+    }
 # endif
+  return (*pglob->gl_stat) (fullname, &st) == 0;
 }
-# ifdef _LIBC
-#  define link_exists_p(dfd, dirname, dirnamelen, fname, pglob, flags) \
-  (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)                             \
-   ? link_exists2_p (dirname, dirnamelen, fname, pglob)                              \
-   : ({ struct stat64 st64;                                                  \
-       __fxstatat64 (_STAT_VER, dfd, fname, &st64, 0) == 0; }))
+
+/* Return true if DIR/FNAME exists.  */
+static int
+link_exists_p (int dfd, const char *dir, size_t dirlen, const char *fname,
+              glob_t *pglob, int flags)
+{
+# if defined _LIBC || HAVE_FSTATAT
+  if (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0))
+    return link_exists2_p (dir, dirlen, fname, pglob);
+  else
+    {
+      struct_stat64 st64;
+      return __fxstatat64 (_STAT_VER, dfd, fname, &st64, 0) == 0;
+    }
 # else
-#  define link_exists_p(dfd, dirname, dirnamelen, fname, pglob, flags) \
-  link_exists2_p (dirname, dirnamelen, fname, pglob, flags)
+  return link_exists2_p (dir, dirlen, fname, pglob, flags);
 # endif
+}
 #endif
 
 
@@ -1328,10 +1363,8 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
        }
       else
        {
-#ifdef _LIBC
          int dfd = (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
                     ? -1 : dirfd ((DIR *) stream));
-#endif
          int fnm_flags = ((!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0)
                           | ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
 #if defined _AMIGA || defined VMS
@@ -1449,7 +1482,8 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
          while (1)
            {
              struct globnames *old = names;
-             for (size_t i = 0; i < cur; ++i)
+             size_t i;
+             for (i = 0; i < cur; ++i)
                free (names->name[i]);
              names = names->next;
              /* NB: we will not leak memory here if we exit without
@@ -1474,7 +1508,8 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
          while (1)
            {
              struct globnames *old = names;
-             for (size_t i = 0; i < cur; ++i)
+             size_t i;
+             for (i = 0; i < cur; ++i)
                new_gl_pathv[pglob->gl_offs + pglob->gl_pathc++]
                  = names->name[i];
              names = names->next;