patches/glibc/ports-2.10.1/370-fnmatch.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Mon Feb 13 21:47:25 2012 +0100 (2012-02-13)
changeset 2883 cea814c9932a
permissions -rw-r--r--
libc/glibc: do not consume parameters when parsing them

Currently, there are two constructs used to parse arguments in
glibc backends, one that consumes args as they are parsed, and
one that does not.

Always use the construct that does not eat args as they are parsed.

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