yann@1365: Original patch from: gentoo/src/patchsets/glibc/2.9/5021_all_2.9-fnmatch.patch
yann@1365: 
yann@1365: -= BEGIN original header =-
yann@1365: http://sourceware.org/ml/libc-hacker/2002-11/msg00071.html
yann@1365: 
yann@1365: When fnmatch detects an invalid multibyte character it should fall back to
yann@1365: single byte matching, so that "*" has a chance to match such a string.
yann@1365: 
yann@1365: Andreas.
yann@1365: 
yann@1365: 2005-04-12  Andreas Schwab  <schwab@suse.de>
yann@1365: 
yann@1365: 	* posix/fnmatch.c (fnmatch): If conversion to wide character
yann@1365: 	fails fall back to single byte matching.
yann@1365: 
yann@1365: -= END original header =-
yann@1365: 
yann@1365: diff -durN glibc-2_9.orig/posix/fnmatch.c glibc-2_9/posix/fnmatch.c
yann@1365: --- glibc-2_9.orig/posix/fnmatch.c	2007-07-28 22:35:00.000000000 +0200
yann@1365: +++ glibc-2_9/posix/fnmatch.c	2009-02-02 22:01:25.000000000 +0100
yann@1365: @@ -327,6 +327,7 @@
yann@1365:  # if HANDLE_MULTIBYTE
yann@1365:    if (__builtin_expect (MB_CUR_MAX, 1) != 1)
yann@1365:      {
yann@1365: +      const char *orig_pattern = pattern;
yann@1365:        mbstate_t ps;
yann@1365:        size_t n;
yann@1365:        const char *p;
yann@1365: @@ -382,10 +383,8 @@
yann@1365:  	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
yann@1365:  	  n = mbsrtowcs (wstring, &p, n + 1, &ps);
yann@1365:  	  if (__builtin_expect (n == (size_t) -1, 0))
yann@1365: -	    /* Something wrong.
yann@1365: -	       XXX Do we have to set `errno' to something which mbsrtows hasn't
yann@1365: -	       already done?  */
yann@1365: -	    return -1;
yann@1365: +	    /* Something wrong.  Fall back to single byte matching.  */
yann@1365: +	    goto try_singlebyte;
yann@1365:  	  if (p)
yann@1365:  	    {
yann@1365:  	      memset (&ps, '\0', sizeof (ps));
yann@1365: @@ -397,10 +396,8 @@
yann@1365:  	prepare_wstring:
yann@1365:  	  n = mbsrtowcs (NULL, &string, 0, &ps);
yann@1365:  	  if (__builtin_expect (n == (size_t) -1, 0))
yann@1365: -	    /* Something wrong.
yann@1365: -	       XXX Do we have to set `errno' to something which mbsrtows hasn't
yann@1365: -	       already done?  */
yann@1365: -	    return -1;
yann@1365: +	    /* Something wrong.  Fall back to single byte matching.  */
yann@1365: +	    goto try_singlebyte;
yann@1365:  	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
yann@1365:  	  assert (mbsinit (&ps));
yann@1365:  	  (void) mbsrtowcs (wstring, &string, n + 1, &ps);
yann@1365: @@ -408,6 +405,9 @@
yann@1365:  
yann@1365:        return internal_fnwmatch (wpattern, wstring, wstring + n,
yann@1365:  				flags & FNM_PERIOD, flags, NULL);
yann@1365: +
yann@1365: +    try_singlebyte:
yann@1365: +      pattern = orig_pattern;
yann@1365:      }
yann@1365:  # endif  /* mbstate_t and mbsrtowcs or _LIBC.  */
yann@1365: