mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
Avoid too much stack use in fnmatch.
This commit is contained in:
parent
d22e4cc939
commit
f15ce4d8dc
@ -1,3 +1,9 @@
|
|||||||
|
2010-08-09 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
[BZ #11883]
|
||||||
|
* posix/fnmatch.c: Keep track of alloca use and fall back on malloc.
|
||||||
|
* posix/fnmatch_loop.c: Likewise.
|
||||||
|
|
||||||
2010-07-17 Andi Kleen <ak@linux.intel.com>
|
2010-07-17 Andi Kleen <ak@linux.intel.com>
|
||||||
|
|
||||||
* sysdeps/i386/i386-mcount.S (__fentry__): Define.
|
* sysdeps/i386/i386-mcount.S (__fentry__): Define.
|
||||||
|
4
NEWS
4
NEWS
@ -1,4 +1,4 @@
|
|||||||
GNU C Library NEWS -- history of user-visible changes. 2010-7-29
|
GNU C Library NEWS -- history of user-visible changes. 2010-8-9
|
||||||
Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
|
Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
|
||||||
See the end for copying conditions.
|
See the end for copying conditions.
|
||||||
|
|
||||||
@ -9,7 +9,7 @@ Version 2.13
|
|||||||
|
|
||||||
* The following bugs are resolved with this release:
|
* The following bugs are resolved with this release:
|
||||||
|
|
||||||
11640, 11701, 11840, 11856
|
11640, 11701, 11840, 11856, 11883
|
||||||
|
|
||||||
* POWER7 optimizations: memset, memcmp, strncmp
|
* POWER7 optimizations: memset, memcmp, strncmp
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2007
|
/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2007,2010
|
||||||
Free Software Foundation, Inc.
|
Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
@ -41,6 +41,12 @@
|
|||||||
# include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _LIBC
|
||||||
|
# include <alloca.h>
|
||||||
|
#else
|
||||||
|
# define alloca_account(size., var) alloca (size)
|
||||||
|
#endif
|
||||||
|
|
||||||
/* For platform which support the ISO C amendement 1 functionality we
|
/* For platform which support the ISO C amendement 1 functionality we
|
||||||
support user defined character classes. */
|
support user defined character classes. */
|
||||||
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
|
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
|
||||||
@ -330,8 +336,11 @@ fnmatch (pattern, string, flags)
|
|||||||
mbstate_t ps;
|
mbstate_t ps;
|
||||||
size_t n;
|
size_t n;
|
||||||
const char *p;
|
const char *p;
|
||||||
|
wchar_t *wpattern_malloc = NULL;
|
||||||
wchar_t *wpattern;
|
wchar_t *wpattern;
|
||||||
|
wchar_t *wstring_malloc = NULL;
|
||||||
wchar_t *wstring;
|
wchar_t *wstring;
|
||||||
|
size_t alloca_used = 0;
|
||||||
|
|
||||||
/* Convert the strings into wide characters. */
|
/* Convert the strings into wide characters. */
|
||||||
memset (&ps, '\0', sizeof (ps));
|
memset (&ps, '\0', sizeof (ps));
|
||||||
@ -343,7 +352,8 @@ fnmatch (pattern, string, flags)
|
|||||||
#endif
|
#endif
|
||||||
if (__builtin_expect (n < 1024, 1))
|
if (__builtin_expect (n < 1024, 1))
|
||||||
{
|
{
|
||||||
wpattern = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
|
wpattern = (wchar_t *) alloca_account ((n + 1) * sizeof (wchar_t),
|
||||||
|
alloca_used);
|
||||||
n = mbsrtowcs (wpattern, &p, n + 1, &ps);
|
n = mbsrtowcs (wpattern, &p, n + 1, &ps);
|
||||||
if (__builtin_expect (n == (size_t) -1, 0))
|
if (__builtin_expect (n == (size_t) -1, 0))
|
||||||
/* Something wrong.
|
/* Something wrong.
|
||||||
@ -365,8 +375,11 @@ fnmatch (pattern, string, flags)
|
|||||||
XXX Do we have to set `errno' to something which mbsrtows hasn't
|
XXX Do we have to set `errno' to something which mbsrtows hasn't
|
||||||
already done? */
|
already done? */
|
||||||
return -1;
|
return -1;
|
||||||
wpattern = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
|
wpattern_malloc = wpattern
|
||||||
|
= (wchar_t *) malloc ((n + 1) * sizeof (wchar_t));
|
||||||
assert (mbsinit (&ps));
|
assert (mbsinit (&ps));
|
||||||
|
if (wpattern == NULL)
|
||||||
|
return -2;
|
||||||
(void) mbsrtowcs (wpattern, &pattern, n + 1, &ps);
|
(void) mbsrtowcs (wpattern, &pattern, n + 1, &ps);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -379,13 +392,18 @@ fnmatch (pattern, string, flags)
|
|||||||
p = string;
|
p = string;
|
||||||
if (__builtin_expect (n < 1024, 1))
|
if (__builtin_expect (n < 1024, 1))
|
||||||
{
|
{
|
||||||
wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
|
wstring = (wchar_t *) alloca_account ((n + 1) * sizeof (wchar_t),
|
||||||
|
alloca_used);
|
||||||
n = mbsrtowcs (wstring, &p, n + 1, &ps);
|
n = mbsrtowcs (wstring, &p, n + 1, &ps);
|
||||||
if (__builtin_expect (n == (size_t) -1, 0))
|
if (__builtin_expect (n == (size_t) -1, 0))
|
||||||
/* Something wrong.
|
{
|
||||||
XXX Do we have to set `errno' to something which mbsrtows hasn't
|
/* Something wrong.
|
||||||
already done? */
|
XXX Do we have to set `errno' to something which
|
||||||
return -1;
|
mbsrtows hasn't already done? */
|
||||||
|
free_return:
|
||||||
|
free (wpattern_malloc);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
if (p)
|
if (p)
|
||||||
{
|
{
|
||||||
memset (&ps, '\0', sizeof (ps));
|
memset (&ps, '\0', sizeof (ps));
|
||||||
@ -400,19 +418,32 @@ fnmatch (pattern, string, flags)
|
|||||||
/* Something wrong.
|
/* Something wrong.
|
||||||
XXX Do we have to set `errno' to something which mbsrtows hasn't
|
XXX Do we have to set `errno' to something which mbsrtows hasn't
|
||||||
already done? */
|
already done? */
|
||||||
return -1;
|
goto free_return;
|
||||||
wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
|
|
||||||
|
wstring_malloc = wstring
|
||||||
|
= (wchar_t *) malloc ((n + 1) * sizeof (wchar_t));
|
||||||
|
if (wstring == NULL)
|
||||||
|
{
|
||||||
|
free (wpattern_malloc);
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
assert (mbsinit (&ps));
|
assert (mbsinit (&ps));
|
||||||
(void) mbsrtowcs (wstring, &string, n + 1, &ps);
|
(void) mbsrtowcs (wstring, &string, n + 1, &ps);
|
||||||
}
|
}
|
||||||
|
|
||||||
return internal_fnwmatch (wpattern, wstring, wstring + n,
|
int res = internal_fnwmatch (wpattern, wstring, wstring + n,
|
||||||
flags & FNM_PERIOD, flags, NULL);
|
flags & FNM_PERIOD, flags, NULL,
|
||||||
|
alloca_used);
|
||||||
|
|
||||||
|
free (wstring_malloc);
|
||||||
|
free (wpattern_malloc);
|
||||||
|
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
# endif /* mbstate_t and mbsrtowcs or _LIBC. */
|
# endif /* mbstate_t and mbsrtowcs or _LIBC. */
|
||||||
|
|
||||||
return internal_fnmatch (pattern, string, string + strlen (string),
|
return internal_fnmatch (pattern, string, string + strlen (string),
|
||||||
flags & FNM_PERIOD, flags, NULL);
|
flags & FNM_PERIOD, flags, NULL, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
# ifdef _LIBC
|
# ifdef _LIBC
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 1991-1993,1996-2001,2003-2005,2007
|
/* Copyright (C) 1991-1993,1996-2001,2003-2005,2007,2010
|
||||||
Free Software Foundation, Inc.
|
Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
@ -28,22 +28,24 @@ struct STRUCT
|
|||||||
it matches, nonzero if not. */
|
it matches, nonzero if not. */
|
||||||
static int FCT (const CHAR *pattern, const CHAR *string,
|
static int FCT (const CHAR *pattern, const CHAR *string,
|
||||||
const CHAR *string_end, int no_leading_period, int flags,
|
const CHAR *string_end, int no_leading_period, int flags,
|
||||||
struct STRUCT *ends)
|
struct STRUCT *ends, size_t alloca_used)
|
||||||
internal_function;
|
internal_function;
|
||||||
static int EXT (INT opt, const CHAR *pattern, const CHAR *string,
|
static int EXT (INT opt, const CHAR *pattern, const CHAR *string,
|
||||||
const CHAR *string_end, int no_leading_period, int flags)
|
const CHAR *string_end, int no_leading_period, int flags,
|
||||||
|
size_t alloca_used)
|
||||||
internal_function;
|
internal_function;
|
||||||
static const CHAR *END (const CHAR *patternp) internal_function;
|
static const CHAR *END (const CHAR *patternp) internal_function;
|
||||||
|
|
||||||
static int
|
static int
|
||||||
internal_function
|
internal_function
|
||||||
FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used)
|
||||||
const CHAR *pattern;
|
const CHAR *pattern;
|
||||||
const CHAR *string;
|
const CHAR *string;
|
||||||
const CHAR *string_end;
|
const CHAR *string_end;
|
||||||
int no_leading_period;
|
int no_leading_period;
|
||||||
int flags;
|
int flags;
|
||||||
struct STRUCT *ends;
|
struct STRUCT *ends;
|
||||||
|
size_t alloca_used;
|
||||||
{
|
{
|
||||||
register const CHAR *p = pattern, *n = string;
|
register const CHAR *p = pattern, *n = string;
|
||||||
register UCHAR c;
|
register UCHAR c;
|
||||||
@ -67,10 +69,8 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
|||||||
case L('?'):
|
case L('?'):
|
||||||
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
||||||
{
|
{
|
||||||
int res;
|
int res = EXT (c, p, n, string_end, no_leading_period,
|
||||||
|
flags, alloca_used);
|
||||||
res = EXT (c, p, n, string_end, no_leading_period,
|
|
||||||
flags);
|
|
||||||
if (res != -1)
|
if (res != -1)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@ -99,10 +99,8 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
|||||||
case L('*'):
|
case L('*'):
|
||||||
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
||||||
{
|
{
|
||||||
int res;
|
int res = EXT (c, p, n, string_end, no_leading_period,
|
||||||
|
flags, alloca_used);
|
||||||
res = EXT (c, p, n, string_end, no_leading_period,
|
|
||||||
flags);
|
|
||||||
if (res != -1)
|
if (res != -1)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@ -191,7 +189,7 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
|||||||
|
|
||||||
for (--p; n < endp; ++n, no_leading_period = 0)
|
for (--p; n < endp; ++n, no_leading_period = 0)
|
||||||
if (FCT (p, n, string_end, no_leading_period, flags2,
|
if (FCT (p, n, string_end, no_leading_period, flags2,
|
||||||
&end) == 0)
|
&end, alloca_used) == 0)
|
||||||
goto found;
|
goto found;
|
||||||
}
|
}
|
||||||
else if (c == L('/') && (flags & FNM_FILE_NAME))
|
else if (c == L('/') && (flags & FNM_FILE_NAME))
|
||||||
@ -200,7 +198,7 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
|||||||
++n;
|
++n;
|
||||||
if (n < string_end && *n == L('/')
|
if (n < string_end && *n == L('/')
|
||||||
&& (FCT (p, n + 1, string_end, flags & FNM_PERIOD, flags,
|
&& (FCT (p, n + 1, string_end, flags & FNM_PERIOD, flags,
|
||||||
NULL) == 0))
|
NULL, alloca_used) == 0))
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -214,7 +212,7 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
|||||||
for (--p; n < endp; ++n, no_leading_period = 0)
|
for (--p; n < endp; ++n, no_leading_period = 0)
|
||||||
if (FOLD ((UCHAR) *n) == c
|
if (FOLD ((UCHAR) *n) == c
|
||||||
&& (FCT (p, n, string_end, no_leading_period, flags2,
|
&& (FCT (p, n, string_end, no_leading_period, flags2,
|
||||||
&end) == 0))
|
&end, alloca_used) == 0))
|
||||||
{
|
{
|
||||||
found:
|
found:
|
||||||
if (end.pattern == NULL)
|
if (end.pattern == NULL)
|
||||||
@ -749,7 +747,7 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
|||||||
_NL_COLLATE_SYMB_EXTRAMB);
|
_NL_COLLATE_SYMB_EXTRAMB);
|
||||||
|
|
||||||
/* Locate the character in the hashing
|
/* Locate the character in the hashing
|
||||||
table. */
|
table. */
|
||||||
hash = elem_hash (str, c1);
|
hash = elem_hash (str, c1);
|
||||||
|
|
||||||
idx = 0;
|
idx = 0;
|
||||||
@ -971,9 +969,8 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
|||||||
case L('!'):
|
case L('!'):
|
||||||
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
||||||
{
|
{
|
||||||
int res;
|
int res = EXT (c, p, n, string_end, no_leading_period, flags,
|
||||||
|
alloca_used);
|
||||||
res = EXT (c, p, n, string_end, no_leading_period, flags);
|
|
||||||
if (res != -1)
|
if (res != -1)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@ -1052,26 +1049,32 @@ END (const CHAR *pattern)
|
|||||||
static int
|
static int
|
||||||
internal_function
|
internal_function
|
||||||
EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
||||||
int no_leading_period, int flags)
|
int no_leading_period, int flags, size_t alloca_used)
|
||||||
{
|
{
|
||||||
const CHAR *startp;
|
const CHAR *startp;
|
||||||
int level;
|
int level;
|
||||||
struct patternlist
|
struct patternlist
|
||||||
{
|
{
|
||||||
struct patternlist *next;
|
struct patternlist *next;
|
||||||
|
CHAR malloced;
|
||||||
CHAR str[0];
|
CHAR str[0];
|
||||||
} *list = NULL;
|
} *list = NULL;
|
||||||
struct patternlist **lastp = &list;
|
struct patternlist **lastp = &list;
|
||||||
size_t pattern_len = STRLEN (pattern);
|
size_t pattern_len = STRLEN (pattern);
|
||||||
|
int any_malloced = 0;
|
||||||
const CHAR *p;
|
const CHAR *p;
|
||||||
const CHAR *rs;
|
const CHAR *rs;
|
||||||
|
int retval = 0;
|
||||||
|
|
||||||
/* Parse the pattern. Store the individual parts in the list. */
|
/* Parse the pattern. Store the individual parts in the list. */
|
||||||
level = 0;
|
level = 0;
|
||||||
for (startp = p = pattern + 1; level >= 0; ++p)
|
for (startp = p = pattern + 1; level >= 0; ++p)
|
||||||
if (*p == L('\0'))
|
if (*p == L('\0'))
|
||||||
/* This is an invalid pattern. */
|
{
|
||||||
return -1;
|
/* This is an invalid pattern. */
|
||||||
|
retval = -1;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
else if (*p == L('['))
|
else if (*p == L('['))
|
||||||
{
|
{
|
||||||
/* Handle brackets special. */
|
/* Handle brackets special. */
|
||||||
@ -1088,8 +1091,11 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
/* Skip over all characters of the list. */
|
/* Skip over all characters of the list. */
|
||||||
while (*p != L(']'))
|
while (*p != L(']'))
|
||||||
if (*p++ == L('\0'))
|
if (*p++ == L('\0'))
|
||||||
/* This is no valid pattern. */
|
{
|
||||||
return -1;
|
/* This is no valid pattern. */
|
||||||
|
retval = -1;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if ((*p == L('?') || *p == L('*') || *p == L('+') || *p == L('@')
|
else if ((*p == L('?') || *p == L('*') || *p == L('+') || *p == L('@')
|
||||||
|| *p == L('!')) && p[1] == L('('))
|
|| *p == L('!')) && p[1] == L('('))
|
||||||
@ -1102,15 +1108,27 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
/* This means we found the end of the pattern. */
|
/* This means we found the end of the pattern. */
|
||||||
#define NEW_PATTERN \
|
#define NEW_PATTERN \
|
||||||
struct patternlist *newp; \
|
struct patternlist *newp; \
|
||||||
\
|
size_t slen = (opt == L('?') || opt == L('@') \
|
||||||
if (opt == L('?') || opt == L('@')) \
|
? pattern_len : (p - startp + 1)); \
|
||||||
newp = alloca (sizeof (struct patternlist) \
|
slen = sizeof (struct patternlist) + (slen * sizeof (CHAR)); \
|
||||||
+ (pattern_len * sizeof (CHAR))); \
|
int malloced = ! __libc_use_alloca (alloca_used + slen); \
|
||||||
|
if (__builtin_expect (malloced, 0)) \
|
||||||
|
{ \
|
||||||
|
newp = alloca_account (slen, alloca_used); \
|
||||||
|
any_malloced = 1; \
|
||||||
|
} \
|
||||||
else \
|
else \
|
||||||
newp = alloca (sizeof (struct patternlist) \
|
{ \
|
||||||
+ ((p - startp + 1) * sizeof (CHAR))); \
|
newp = malloc (slen); \
|
||||||
*((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L('\0'); \
|
if (newp == NULL) \
|
||||||
|
{ \
|
||||||
|
retval = -2; \
|
||||||
|
goto out; \
|
||||||
|
} \
|
||||||
|
} \
|
||||||
newp->next = NULL; \
|
newp->next = NULL; \
|
||||||
|
newp->malloced = malloced; \
|
||||||
|
*((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L('\0'); \
|
||||||
*lastp = newp; \
|
*lastp = newp; \
|
||||||
lastp = &newp->next
|
lastp = &newp->next
|
||||||
NEW_PATTERN;
|
NEW_PATTERN;
|
||||||
@ -1131,8 +1149,9 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
switch (opt)
|
switch (opt)
|
||||||
{
|
{
|
||||||
case L('*'):
|
case L('*'):
|
||||||
if (FCT (p, string, string_end, no_leading_period, flags, NULL) == 0)
|
if (FCT (p, string, string_end, no_leading_period, flags, NULL,
|
||||||
return 0;
|
alloca_used) == 0)
|
||||||
|
goto success;
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
|
|
||||||
case L('+'):
|
case L('+'):
|
||||||
@ -1143,7 +1162,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
current pattern. */
|
current pattern. */
|
||||||
if (FCT (list->str, string, rs, no_leading_period,
|
if (FCT (list->str, string, rs, no_leading_period,
|
||||||
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
||||||
NULL) == 0
|
NULL, alloca_used) == 0
|
||||||
/* This was successful. Now match the rest with the rest
|
/* This was successful. Now match the rest with the rest
|
||||||
of the pattern. */
|
of the pattern. */
|
||||||
&& (FCT (p, rs, string_end,
|
&& (FCT (p, rs, string_end,
|
||||||
@ -1151,7 +1170,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
? no_leading_period
|
? no_leading_period
|
||||||
: rs[-1] == '/' && NO_LEADING_PERIOD (flags) ? 1 : 0,
|
: rs[-1] == '/' && NO_LEADING_PERIOD (flags) ? 1 : 0,
|
||||||
flags & FNM_FILE_NAME
|
flags & FNM_FILE_NAME
|
||||||
? flags : flags & ~FNM_PERIOD, NULL) == 0
|
? flags : flags & ~FNM_PERIOD, NULL, alloca_used) == 0
|
||||||
/* This didn't work. Try the whole pattern. */
|
/* This didn't work. Try the whole pattern. */
|
||||||
|| (rs != string
|
|| (rs != string
|
||||||
&& FCT (pattern - 1, rs, string_end,
|
&& FCT (pattern - 1, rs, string_end,
|
||||||
@ -1160,18 +1179,21 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
: (rs[-1] == '/' && NO_LEADING_PERIOD (flags)
|
: (rs[-1] == '/' && NO_LEADING_PERIOD (flags)
|
||||||
? 1 : 0),
|
? 1 : 0),
|
||||||
flags & FNM_FILE_NAME
|
flags & FNM_FILE_NAME
|
||||||
? flags : flags & ~FNM_PERIOD, NULL) == 0)))
|
? flags : flags & ~FNM_PERIOD, NULL,
|
||||||
|
alloca_used) == 0)))
|
||||||
/* It worked. Signal success. */
|
/* It worked. Signal success. */
|
||||||
return 0;
|
goto success;
|
||||||
}
|
}
|
||||||
while ((list = list->next) != NULL);
|
while ((list = list->next) != NULL);
|
||||||
|
|
||||||
/* None of the patterns lead to a match. */
|
/* None of the patterns lead to a match. */
|
||||||
return FNM_NOMATCH;
|
retval = FNM_NOMATCH;
|
||||||
|
break;
|
||||||
|
|
||||||
case L('?'):
|
case L('?'):
|
||||||
if (FCT (p, string, string_end, no_leading_period, flags, NULL) == 0)
|
if (FCT (p, string, string_end, no_leading_period, flags, NULL,
|
||||||
return 0;
|
alloca_used) == 0)
|
||||||
|
goto success;
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
|
|
||||||
case L('@'):
|
case L('@'):
|
||||||
@ -1183,13 +1205,14 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
if (FCT (STRCAT (list->str, p), string, string_end,
|
if (FCT (STRCAT (list->str, p), string, string_end,
|
||||||
no_leading_period,
|
no_leading_period,
|
||||||
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
||||||
NULL) == 0)
|
NULL, alloca_used) == 0)
|
||||||
/* It worked. Signal success. */
|
/* It worked. Signal success. */
|
||||||
return 0;
|
goto success;
|
||||||
while ((list = list->next) != NULL);
|
while ((list = list->next) != NULL);
|
||||||
|
|
||||||
/* None of the patterns lead to a match. */
|
/* None of the patterns lead to a match. */
|
||||||
return FNM_NOMATCH;
|
retval = FNM_NOMATCH;
|
||||||
|
break;
|
||||||
|
|
||||||
case L('!'):
|
case L('!'):
|
||||||
for (rs = string; rs <= string_end; ++rs)
|
for (rs = string; rs <= string_end; ++rs)
|
||||||
@ -1199,7 +1222,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
for (runp = list; runp != NULL; runp = runp->next)
|
for (runp = list; runp != NULL; runp = runp->next)
|
||||||
if (FCT (runp->str, string, rs, no_leading_period,
|
if (FCT (runp->str, string, rs, no_leading_period,
|
||||||
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
||||||
NULL) == 0)
|
NULL, alloca_used) == 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* If none of the patterns matched see whether the rest does. */
|
/* If none of the patterns matched see whether the rest does. */
|
||||||
@ -1209,21 +1232,34 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|||||||
? no_leading_period
|
? no_leading_period
|
||||||
: rs[-1] == '/' && NO_LEADING_PERIOD (flags) ? 1 : 0,
|
: rs[-1] == '/' && NO_LEADING_PERIOD (flags) ? 1 : 0,
|
||||||
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD,
|
||||||
NULL) == 0))
|
NULL, alloca_used) == 0))
|
||||||
/* This is successful. */
|
/* This is successful. */
|
||||||
return 0;
|
goto success;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* None of the patterns together with the rest of the pattern
|
/* None of the patterns together with the rest of the pattern
|
||||||
lead to a match. */
|
lead to a match. */
|
||||||
return FNM_NOMATCH;
|
retval = FNM_NOMATCH;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
assert (! "Invalid extended matching operator");
|
assert (! "Invalid extended matching operator");
|
||||||
|
retval = -1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
success:
|
||||||
|
out:
|
||||||
|
if (any_malloced)
|
||||||
|
while (list != NULL)
|
||||||
|
{
|
||||||
|
struct patternlist *old = list;
|
||||||
|
list = list->next;
|
||||||
|
if (old->malloced)
|
||||||
|
free (old);
|
||||||
|
}
|
||||||
|
|
||||||
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user