source: scripts/fetch/eglibc/2.10.1/15-fnpatch.patch@ 70566fa

posix/fnmatch.c

@@ -327 +327 @@
 # if HANDLE_MULTIBYTE
   if (__builtin_expect (MB_CUR_MAX, 1) != 1)
     {
+      const char *orig_pattern = pattern;
       mbstate_t ps;
       size_t n;
       const char *p;
@@ -378 +379 @@
           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;
+            /* Something wrong.  Fall back to single byte matching.  */
+            goto try_singlebyte;
           if (p)
             memset (&ps, '\0', sizeof (ps));
         }
@@ -389 +388 @@
         {
           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;
+            /* Something wrong.  Fall back to single byte matching.  */
+            goto try_singlebyte;
           wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
           assert (mbsinit (&ps));
           (void) mbsrtowcs (wstring, &string, n + 1, &ps);
@@ -400 +397 @@
 
       return internal_fnwmatch (wpattern, wstring, wstring + n,
                                 flags & FNM_PERIOD, flags, NULL);
+
+    try_singlebyte:
+      pattern = orig_pattern;
     }
 # endif  /* mbstate_t and mbsrtowcs or _LIBC.  */