|
yann@1365
|
1 |
Original patch from: gentoo/src/patchsets/glibc/2.9/5021_all_2.9-fnmatch.patch
|
|
yann@1365
|
2 |
|
|
yann@1365
|
3 |
-= BEGIN original header =-
|
|
yann@1365
|
4 |
http://sourceware.org/ml/libc-hacker/2002-11/msg00071.html
|
|
yann@1365
|
5 |
|
|
yann@1365
|
6 |
When fnmatch detects an invalid multibyte character it should fall back to
|
|
yann@1365
|
7 |
single byte matching, so that "*" has a chance to match such a string.
|
|
yann@1365
|
8 |
|
|
yann@1365
|
9 |
Andreas.
|
|
yann@1365
|
10 |
|
|
yann@1365
|
11 |
2005-04-12 Andreas Schwab <schwab@suse.de>
|
|
yann@1365
|
12 |
|
|
yann@1365
|
13 |
* posix/fnmatch.c (fnmatch): If conversion to wide character
|
|
yann@1365
|
14 |
fails fall back to single byte matching.
|
|
yann@1365
|
15 |
|
|
yann@1365
|
16 |
-= END original header =-
|
|
yann@1365
|
17 |
|
|
yann@1365
|
18 |
diff -durN glibc-2_9.orig/posix/fnmatch.c glibc-2_9/posix/fnmatch.c
|
|
yann@1365
|
19 |
--- glibc-2_9.orig/posix/fnmatch.c 2007-07-28 22:35:00.000000000 +0200
|
|
yann@1365
|
20 |
+++ glibc-2_9/posix/fnmatch.c 2009-02-02 22:01:25.000000000 +0100
|
|
yann@1365
|
21 |
@@ -327,6 +327,7 @@
|
|
yann@1365
|
22 |
# if HANDLE_MULTIBYTE
|
|
yann@1365
|
23 |
if (__builtin_expect (MB_CUR_MAX, 1) != 1)
|
|
yann@1365
|
24 |
{
|
|
yann@1365
|
25 |
+ const char *orig_pattern = pattern;
|
|
yann@1365
|
26 |
mbstate_t ps;
|
|
yann@1365
|
27 |
size_t n;
|
|
yann@1365
|
28 |
const char *p;
|
|
yann@1365
|
29 |
@@ -382,10 +383,8 @@
|
|
yann@1365
|
30 |
wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
|
|
yann@1365
|
31 |
n = mbsrtowcs (wstring, &p, n + 1, &ps);
|
|
yann@1365
|
32 |
if (__builtin_expect (n == (size_t) -1, 0))
|
|
yann@1365
|
33 |
- /* Something wrong.
|
|
yann@1365
|
34 |
- XXX Do we have to set `errno' to something which mbsrtows hasn't
|
|
yann@1365
|
35 |
- already done? */
|
|
yann@1365
|
36 |
- return -1;
|
|
yann@1365
|
37 |
+ /* Something wrong. Fall back to single byte matching. */
|
|
yann@1365
|
38 |
+ goto try_singlebyte;
|
|
yann@1365
|
39 |
if (p)
|
|
yann@1365
|
40 |
{
|
|
yann@1365
|
41 |
memset (&ps, '\0', sizeof (ps));
|
|
yann@1365
|
42 |
@@ -397,10 +396,8 @@
|
|
yann@1365
|
43 |
prepare_wstring:
|
|
yann@1365
|
44 |
n = mbsrtowcs (NULL, &string, 0, &ps);
|
|
yann@1365
|
45 |
if (__builtin_expect (n == (size_t) -1, 0))
|
|
yann@1365
|
46 |
- /* Something wrong.
|
|
yann@1365
|
47 |
- XXX Do we have to set `errno' to something which mbsrtows hasn't
|
|
yann@1365
|
48 |
- already done? */
|
|
yann@1365
|
49 |
- return -1;
|
|
yann@1365
|
50 |
+ /* Something wrong. Fall back to single byte matching. */
|
|
yann@1365
|
51 |
+ goto try_singlebyte;
|
|
yann@1365
|
52 |
wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
|
|
yann@1365
|
53 |
assert (mbsinit (&ps));
|
|
yann@1365
|
54 |
(void) mbsrtowcs (wstring, &string, n + 1, &ps);
|
|
yann@1365
|
55 |
@@ -408,6 +405,9 @@
|
|
yann@1365
|
56 |
|
|
yann@1365
|
57 |
return internal_fnwmatch (wpattern, wstring, wstring + n,
|
|
yann@1365
|
58 |
flags & FNM_PERIOD, flags, NULL);
|
|
yann@1365
|
59 |
+
|
|
yann@1365
|
60 |
+ try_singlebyte:
|
|
yann@1365
|
61 |
+ pattern = orig_pattern;
|
|
yann@1365
|
62 |
}
|
|
yann@1365
|
63 |
# endif /* mbstate_t and mbsrtowcs or _LIBC. */
|
|
yann@1365
|
64 |
|