From: Andreas Schwab <sch...@redhat.com>
* posix/glob.c (glob): Match only directories when pattern ends in
a slash. Return no match when pattern is empty.
Reported via Paolo Bonzini.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
ChangeLog | 7 +++++++
lib/glob.c | 47 ++++++++---------------------------------------
2 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b2e66e4..43386c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-22 Andreas Schwab <sch...@redhat.com>
+
+ glob: fix empty pattern and patterns ending in slash
+ * posix/glob.c (glob): Match only directories when pattern ends in
+ a slash. Return no match when pattern is empty.
+ Reported via Paolo Bonzini.
+
2010-03-22 Eric Blake <ebl...@redhat.com>
glob: synchronize from glibc
diff --git a/lib/glob.c b/lib/glob.c
index deceeb7..a053544 100644
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -498,45 +498,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;
- int val;
- 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);
- }
- }
- 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))
@@ -558,6 +519,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;
+ }
+
if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~')
{
if (dirname[1] == '\0' || dirname[1] == '/'
--
1.6.6.1
