patches/glibc/2_9/410-2.9-fnmatch.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Feb 02 22:00:18 2009 +0000 (2009-02-02)
changeset 1201 c9967a6e3b25
permissions -rw-r--r--
Add a patchset for glibc 2_9. Vampirised from the gentoo repository.

/trunk/patches/glibc/2_9/500-ppc-glibc-2.9-atomic.patch | 414 414 0 0 ++++++++++
/trunk/patches/glibc/2_9/140-regex-BZ9697.patch | 111 111 0 0 +++
/trunk/patches/glibc/2_9/190-queue-header-updates.patch | 89 89 0 0 ++
/trunk/patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch | 249 249 0 0 ++++++
/trunk/patches/glibc/2_9/450-alpha-glibc-2.5-no-page-header.patch | 32 32 0 0 +
/trunk/patches/glibc/2_9/270-ldbl-nexttowardf.patch | 68 68 0 0 ++
/trunk/patches/glibc/2_9/330-2.3.3-china.patch | 35 35 0 0 +
/trunk/patches/glibc/2_9/340-new-valencian-locale.patch | 120 120 0 0 +++
/trunk/patches/glibc/2_9/410-2.9-fnmatch.patch | 64 64 0 0 ++
/trunk/patches/glibc/2_9/350-2.4-undefine-__i686.patch | 47 47 0 0 +
/trunk/patches/glibc/2_9/160-i386-x86_64-revert-clone-cfi.patch | 53 53 0 0 +
/trunk/patches/glibc/2_9/420-dont-build-timezone.patch | 19 19 0 0 +
/trunk/patches/glibc/2_9/150-regex-BZ697.patch | 28 28 0 0 +
/trunk/patches/glibc/2_9/290-no-inline-gmon.patch | 38 38 0 0 +
/trunk/patches/glibc/2_9/280-section-comments.patch | 29 29 0 0 +
/trunk/patches/glibc/2_9/180-math-tests.patch | 72 72 0 0 ++
/trunk/patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch | 35 35 0 0 +
/trunk/patches/glibc/2_9/250-resolv-dynamic.patch | 44 44 0 0 +
/trunk/patches/glibc/2_9/300-2.9-check_native-headers.patch | 22 22 0 0 +
/trunk/patches/glibc/2_9/310-2.3.6-fix-pr631.patch | 50 50 0 0 +
/trunk/patches/glibc/2_9/130-add_prio-macros.patch | 26 26 0 0 +
/trunk/patches/glibc/2_9/260-fadvise64_64.patch | 30 30 0 0 +
/trunk/patches/glibc/2_9/440-alpha-glibc-2.4-xstat.patch | 249 249 0 0 ++++++
/trunk/patches/glibc/2_9/170-2.10-dns-no-gethostbyname4.patch | 35 35 0 0 +
/trunk/patches/glibc/2_9/230-2.3.3-localedef-fix-trampoline.patch | 74 74 0 0 ++
/trunk/patches/glibc/2_9/360-2.8-nscd-one-fork.patch | 45 45 0 0 +
/trunk/patches/glibc/2_9/480-alpha-glibc-2.8-cache-shape.patch | 18 18 0 0 +
/trunk/patches/glibc/2_9/210-2.9-strlen-hack.patch | 109 109 0 0 +++
/trunk/patches/glibc/2_9/320-2.9-assume-pipe2.patch | 59 59 0 0 +
/trunk/patches/glibc/2_9/100-ssp-compat.patch | 193 193 0 0 +++++
/trunk/patches/glibc/2_9/110-respect-env-CPPFLAGS.patch | 30 30 0 0 +
/trunk/patches/glibc/2_9/220-manual-no-perl.patch | 29 29 0 0 +
/trunk/patches/glibc/2_9/390-2.3.3_pre20040117-pt_pax.patch | 35 35 0 0 +
/trunk/patches/glibc/2_9/460-alpha-glibc-2.5-no-asm-elf-header.patch | 38 38 0 0 +
/trunk/patches/glibc/2_9/400-tests-sandbox-libdl-paths.patch | 198 198 0 0 +++++
/trunk/patches/glibc/2_9/240-i386-LOAD_PIC_REG.patch | 23 23 0 0 +
/trunk/patches/glibc/2_9/200-awk-in-C-locale.patch | 23 23 0 0 +
/trunk/patches/glibc/2_9/430-2.7-cross-compile-nptl.patch | 57 57 0 0 +
/trunk/patches/glibc/2_9/380-2.3.6-dl_execstack-PaX-support.patch | 71 71 0 0 ++
/trunk/patches/glibc/2_9/490-ptr-mangling.patch | 114 114 0 0 +++
/trunk/patches/glibc/2_9/470-alpha-glibc-2.8-creat.patch | 19 19 0 0 +
41 files changed, 3094 insertions(+)
yann@1201
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/5021_all_2.9-fnmatch.patch
yann@1201
     2
yann@1201
     3
-= BEGIN original header =-
yann@1201
     4
http://sourceware.org/ml/libc-hacker/2002-11/msg00071.html
yann@1201
     5
yann@1201
     6
When fnmatch detects an invalid multibyte character it should fall back to
yann@1201
     7
single byte matching, so that "*" has a chance to match such a string.
yann@1201
     8
yann@1201
     9
Andreas.
yann@1201
    10
yann@1201
    11
2005-04-12  Andreas Schwab  <schwab@suse.de>
yann@1201
    12
yann@1201
    13
	* posix/fnmatch.c (fnmatch): If conversion to wide character
yann@1201
    14
	fails fall back to single byte matching.
yann@1201
    15
yann@1201
    16
-= END original header =-
yann@1201
    17
yann@1201
    18
diff -durN glibc-2_9.orig/posix/fnmatch.c glibc-2_9/posix/fnmatch.c
yann@1201
    19
--- glibc-2_9.orig/posix/fnmatch.c	2007-07-28 22:35:00.000000000 +0200
yann@1201
    20
+++ glibc-2_9/posix/fnmatch.c	2009-02-02 22:01:25.000000000 +0100
yann@1201
    21
@@ -327,6 +327,7 @@
yann@1201
    22
 # if HANDLE_MULTIBYTE
yann@1201
    23
   if (__builtin_expect (MB_CUR_MAX, 1) != 1)
yann@1201
    24
     {
yann@1201
    25
+      const char *orig_pattern = pattern;
yann@1201
    26
       mbstate_t ps;
yann@1201
    27
       size_t n;
yann@1201
    28
       const char *p;
yann@1201
    29
@@ -382,10 +383,8 @@
yann@1201
    30
 	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
yann@1201
    31
 	  n = mbsrtowcs (wstring, &p, n + 1, &ps);
yann@1201
    32
 	  if (__builtin_expect (n == (size_t) -1, 0))
yann@1201
    33
-	    /* Something wrong.
yann@1201
    34
-	       XXX Do we have to set `errno' to something which mbsrtows hasn't
yann@1201
    35
-	       already done?  */
yann@1201
    36
-	    return -1;
yann@1201
    37
+	    /* Something wrong.  Fall back to single byte matching.  */
yann@1201
    38
+	    goto try_singlebyte;
yann@1201
    39
 	  if (p)
yann@1201
    40
 	    {
yann@1201
    41
 	      memset (&ps, '\0', sizeof (ps));
yann@1201
    42
@@ -397,10 +396,8 @@
yann@1201
    43
 	prepare_wstring:
yann@1201
    44
 	  n = mbsrtowcs (NULL, &string, 0, &ps);
yann@1201
    45
 	  if (__builtin_expect (n == (size_t) -1, 0))
yann@1201
    46
-	    /* Something wrong.
yann@1201
    47
-	       XXX Do we have to set `errno' to something which mbsrtows hasn't
yann@1201
    48
-	       already done?  */
yann@1201
    49
-	    return -1;
yann@1201
    50
+	    /* Something wrong.  Fall back to single byte matching.  */
yann@1201
    51
+	    goto try_singlebyte;
yann@1201
    52
 	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
yann@1201
    53
 	  assert (mbsinit (&ps));
yann@1201
    54
 	  (void) mbsrtowcs (wstring, &string, n + 1, &ps);
yann@1201
    55
@@ -408,6 +405,9 @@
yann@1201
    56
 
yann@1201
    57
       return internal_fnwmatch (wpattern, wstring, wstring + n,
yann@1201
    58
 				flags & FNM_PERIOD, flags, NULL);
yann@1201
    59
+
yann@1201
    60
+    try_singlebyte:
yann@1201
    61
+      pattern = orig_pattern;
yann@1201
    62
     }
yann@1201
    63
 # endif  /* mbstate_t and mbsrtowcs or _LIBC.  */
yann@1201
    64