aboutsummaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-03-30 04:17:47 +0000
committerUlrich Drepper <drepper@redhat.com>2005-03-30 04:17:47 +0000
commit7a409a1a7c960c0ee7e3f22a59dade4d397a5ddc (patch)
tree06a423451d21245c5f7d3b6d410081f0179d98a9 /posix
parent9640622776d1f9833590ec15e4f59eceee7dd379 (diff)
downloadglibc-7a409a1a7c960c0ee7e3f22a59dade4d397a5ddc.tar
glibc-7a409a1a7c960c0ee7e3f22a59dade4d397a5ddc.tar.gz
glibc-7a409a1a7c960c0ee7e3f22a59dade4d397a5ddc.tar.bz2
glibc-7a409a1a7c960c0ee7e3f22a59dade4d397a5ddc.zip
(fnmatch): For short patterns or strings attempt to avoid calling mbsrtowcs twice.
Diffstat (limited to 'posix')
-rw-r--r--posix/fnmatch.c79
1 files changed, 61 insertions, 18 deletions
diff --git a/posix/fnmatch.c b/posix/fnmatch.c
index e409ed7300..3fa7c322d1 100644
--- a/posix/fnmatch.c
+++ b/posix/fnmatch.c
@@ -327,31 +327,74 @@ fnmatch (pattern, string, flags)
{
mbstate_t ps;
size_t n;
+ const char *p;
wchar_t *wpattern;
wchar_t *wstring;
/* Convert the strings into wide characters. */
memset (&ps, '\0', sizeof (ps));
- n = mbsrtowcs (NULL, &pattern, 0, &ps);
- if (__builtin_expect (n == (size_t) -1, 0))
- /* Something wrong.
- XXX Do we have to set `errno' to something which mbsrtows hasn't
- already done? */
- return -1;
- wpattern = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
- assert (mbsinit (&ps));
- (void) mbsrtowcs (wpattern, &pattern, n + 1, &ps);
+ p = pattern;
+#ifdef _LIBC
+ n = strnlen (pattern, 1024);
+#else
+ n = strlen (pattern);
+#endif
+ if (__builtin_expect (n < 1024, 1))
+ {
+ wpattern = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
+ n = mbsrtowcs (wpattern, &p, n + 1, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+ /* Something wrong.
+ XXX Do we have to set `errno' to something which mbsrtows hasn't
+ already done? */
+ return -1;
+ if (p)
+ memset (&ps, '\0', sizeof (ps));
+ }
+ if (__builtin_expect (p != NULL, 0))
+ {
+ n = mbsrtowcs (NULL, &pattern, 0, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+ /* Something wrong.
+ XXX Do we have to set `errno' to something which mbsrtows hasn't
+ already done? */
+ return -1;
+ wpattern = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
+ assert (mbsinit (&ps));
+ (void) mbsrtowcs (wpattern, &pattern, n + 1, &ps);
+ }
assert (mbsinit (&ps));
- n = mbsrtowcs (NULL, &string, 0, &ps);
- if (__builtin_expect (n == (size_t) -1, 0))
- /* Something wrong.
- XXX Do we have to set `errno' to something which mbsrtows hasn't
- already done? */
- return -1;
- wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
- assert (mbsinit (&ps));
- (void) mbsrtowcs (wstring, &string, n + 1, &ps);
+#ifdef _LIBC
+ n = strnlen (string, 1024);
+#else
+ n = strlen (string);
+#endif
+ p = string;
+ if (__builtin_expect (n < 1024, 1))
+ {
+ wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
+ n = mbsrtowcs (wstring, &p, n + 1, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+ /* Something wrong.
+ XXX Do we have to set `errno' to something which mbsrtows hasn't
+ already done? */
+ return -1;
+ if (p)
+ memset (&ps, '\0', sizeof (ps));
+ }
+ if (__builtin_expect (p != NULL, 0))
+ {
+ n = mbsrtowcs (NULL, &string, 0, &ps);
+ if (__builtin_expect (n == (size_t) -1, 0))
+ /* Something wrong.
+ XXX Do we have to set `errno' to something which mbsrtows hasn't
+ already done? */
+ return -1;
+ wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
+ assert (mbsinit (&ps));
+ (void) mbsrtowcs (wstring, &string, n + 1, &ps);
+ }
return internal_fnwmatch (wpattern, wstring, wstring + n,
flags & FNM_PERIOD, flags);