From a5f3b0f830920ae31e24cad8fe5d877bba556764 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 27 Mar 2010 05:48:17 -0700 Subject: [PATCH] Fix one more issue with the glob patch. --- ChangeLog | 4 ++++ posix/glob.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d020871231..0969ca2de1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-27 Ulrich Drepper + + * posix/glob.c (glob): Initialize oldcount early, too. + 2010-03-26 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/fcntl.c: Define miss_F_GETOWN_EX diff --git a/posix/glob.c b/posix/glob.c index 3ae055d430..e410d50ffe 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -436,6 +436,8 @@ glob (pattern, flags, errfunc, pglob) } } + oldcount = pglob->gl_pathc + pglob->gl_offs; + /* Find the filename. */ filename = strrchr (pattern, '/'); #if defined __MSDOS__ || defined WINDOWS32 @@ -553,8 +555,6 @@ glob (pattern, flags, errfunc, pglob) } } - oldcount = pglob->gl_pathc + pglob->gl_offs; - #ifndef VMS if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~') { -- 2.11.4.GIT