mirrors/make-dfsg
1
0
Fork 0
mirror of https://salsa.debian.org/srivasta/make-dfsg.git synced 2025-02-07 13:03:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* glob.c (glob) [SV 18123]: Cherry-pick glibc fix

Browse source 
Apply commit a471e96a5352a5f0bde6d32dd36d33524811a2b1 from
git://sourceware.org/git/glibc.git to fix
https://sourceware.org/bugzilla/show_bug.cgi?id=10278
This commit is contained in:
Paul Smith 2013-10-20 13:18:03 -04:00
parent 53b4a9e668
commit 5d653b535a
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
glob/ChangeLog
View file

@ -1,3 +1,9 @@
2013-10-20 Paul Smith <psmith@gnu.org>
* glob.c (glob): Cherry-pick a471e96a5352a5f0bde6d32dd36d33524811a2b1
from git://sourceware.org/git/glibc.git to fix SV 18123,
https://sourceware.org/bugzilla/show_bug.cgi?id=10278
2008-09-28 Juan Manuel Guerrero <juan.guerrero@gmx.de> 2008-09-28 Juan Manuel Guerrero <juan.guerrero@gmx.de>
* glob.c (my_realloc) [__DJGPP__]: Don't define, and don't * glob.c (my_realloc) [__DJGPP__]: Don't define, and don't

5
glob/glob.c
View file

@ -377,6 +377,11 @@ glob (pattern, flags, errfunc, pglob)
return -1; return -1;
} }
/* POSIX requires all slashes to be matched. This means that with
a trailing slash we must match only directories. */
if (pattern[0] && pattern[strlen (pattern) - 1] == '/')
flags |= GLOB_ONLYDIR;
if (flags & GLOB_BRACE) if (flags & GLOB_BRACE)
{ {
const char *begin = strchr (pattern, '{'); const char *begin = strchr (pattern, '{');