AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-14 07:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(next_brace_sub): Return NULL if braces don't match, fix {{a,b},c} globbing,

Browse Source 
clean up.
This commit is contained in:
Ulrich Drepper 2001-11-29 21:55:01 +00:00
parent a0323a1c8f
commit f47a6ad7db
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sysdeps/generic/glob.c
View File

@ -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 */