diff -r 419d959441ed -r 447b203edc2e patches/glibc/2.1.3/rh62-08-glibc-2.1.3-glob.patch --- a/patches/glibc/2.1.3/rh62-08-glibc-2.1.3-glob.patch Tue Aug 14 19:32:22 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -2001-11-29 Jakub Jelinek - - * sysdeps/generic/glob.c (next_brace_sub): Return NULL if braces - don't match, fix {{a,b},c} globbing, clean up. - Patch by Flavio Veloso . - ---- libc/sysdeps/generic/glob.c.jj Thu Aug 23 18:49:29 2001 -+++ libc/sysdeps/generic/glob.c Thu Nov 29 13:17:21 2001 -@@ -355,42 +355,14 @@ static - inline - #endif - const char * --next_brace_sub (begin) -- const char *begin; -+next_brace_sub (cp) -+ const char *cp; - { - unsigned int depth = 0; -- const char *cp = begin; -- -- while (1) -- { -- if (depth == 0) -- { -- if (*cp != ',' && *cp != '}' && *cp != '\0') -- { -- if (*cp == '{') -- ++depth; -- ++cp; -- continue; -- } -- } -- else -- { -- while (*cp != '\0' && (*cp != '}' || depth > 0)) -- { -- if (*cp == '}') -- --depth; -- ++cp; -- } -- if (*cp == '\0') -- /* An incorrectly terminated brace expression. */ -- return NULL; -- -- continue; -- } -- break; -- } -- -- return cp; -+ while (*cp != '\0' && (*cp != '}' || depth--) && (*cp != ',' || depth)) -+ if (*cp++ == '{') -+ depth++; -+ return *cp != '\0' ? cp : NULL; - } - - #endif /* !GLOB_ONLY_P */