bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fwd: [PATCH] Fix glob with empty pattern and patterns ending in slash


From: Paolo Bonzini
Subject: Fwd: [PATCH] Fix glob with empty pattern and patterns ending in slash
Date: Mon, 22 Mar 2010 18:28:51 +0100

I think this should go in gnulib too, right?

Paolo

---------- Forwarded message ----------
From: Andreas Schwab <address@hidden>
Date: Mon, Mar 22, 2010 at 16:13
Subject: [PATCH] Fix glob with empty pattern and patterns ending in slash
To: address@hidden


* posix/glob.c (glob): Match only directories when pattern ends in
a slash.  Return no match when pattern is empty.
---
 posix/glob.c |   46 ++++++++--------------------------------------
 1 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/posix/glob.c b/posix/glob.c
index 73081ec..ab1c63f 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -489,44 +489,6 @@ glob (pattern, flags, errfunc, pglob)
      *((char *) mempcpy (newp, pattern, dirlen)) = '\0';
      dirname = newp;
      ++filename;
-
-      if (filename[0] == '\0'
-#if defined __MSDOS__ || defined WINDOWS32
-          && dirname[dirlen - 1] != ':'
-         && (dirlen < 3 || dirname[dirlen - 2] != ':'
-             || dirname[dirlen - 1] != '/')
-#endif
-         && dirlen > 1)
-       /* "pattern/".  Expand "pattern", appending slashes.  */
-       {
-         int orig_flags = flags;
-         if (!(flags & GLOB_NOESCAPE) && dirname[dirlen - 1] == '\\')
-           {
-             /* "pattern\\/".  Remove the final backslash if it hasn't
-                been quoted.  */
-             char *p = (char *) &dirname[dirlen - 1];
-
-             while (p > dirname && p[-1] == '\\') --p;
-             if ((&dirname[dirlen] - p) & 1)
-               {
-                 *(char *) &dirname[--dirlen] = '\0';
-                 flags &= ~(GLOB_NOCHECK | GLOB_NOMAGIC);
-               }
-           }
-         int val = glob (dirname, flags | GLOB_MARK, errfunc, pglob);
-         if (val == 0)
-           pglob->gl_flags = ((pglob->gl_flags & ~GLOB_MARK)
-                              | (flags & GLOB_MARK));
-         else if (val == GLOB_NOMATCH && flags != orig_flags)
-           {
-             /* Make sure globfree (&dirs); is a nop.  */
-             dirs.gl_pathv = NULL;
-             flags = orig_flags;
-             oldcount = pglob->gl_pathc + pglob->gl_offs;
-             goto no_matches;
-           }
-         return val;
-       }
    }

  if (!(flags & GLOB_APPEND))
@@ -549,6 +511,14 @@ glob (pattern, flags, errfunc, pglob)

  oldcount = pglob->gl_pathc + pglob->gl_offs;

+  /* An empty pattern cannot match any file name.  */
+  if (pattern[0] == '\0')
+    {
+      /* Make sure globfree (&dirs); is a nop.  */
+      dirs.gl_pathv = NULL;
+      goto no_matches;
+    }
+
 #ifndef VMS
  if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~')
    {
--
1.7.0.1


Andreas.

--
Andreas Schwab, address@hidden
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."




reply via email to

[Prev in Thread] Current Thread [Next in Thread]