qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix one more issue with the glob patch.

This commit is contained in:
Ulrich Drepper 2010-03-27 05:48:17 -07:00
parent 463ed2f0be
commit a5f3b0f830
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2010-03-27 Ulrich Drepper <drepper@redhat.com>
* posix/glob.c (glob): Initialize oldcount early, too.
2010-03-26 Ulrich Drepper <drepper@redhat.com> 2010-03-26 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/fcntl.c: Define miss_F_GETOWN_EX * sysdeps/unix/sysv/linux/i386/fcntl.c: Define miss_F_GETOWN_EX

4
posix/glob.c
View File

@ -436,6 +436,8 @@ glob (pattern, flags, errfunc, pglob)
} }
} }
oldcount = pglob->gl_pathc + pglob->gl_offs;
/* Find the filename. */ /* Find the filename. */
filename = strrchr (pattern, '/'); filename = strrchr (pattern, '/');
#if defined __MSDOS__ || defined WINDOWS32 #if defined __MSDOS__ || defined WINDOWS32
@ -553,8 +555,6 @@ glob (pattern, flags, errfunc, pglob)
} }
} }
oldcount = pglob->gl_pathc + pglob->gl_offs;
#ifndef VMS #ifndef VMS
if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~') if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~')
{ {