patches/glibc/2_9/140-regex-BZ9697.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(+)
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/0052_all_glibc-2.9-regex-BZ9697.patch
     2 
     3 -= BEGIN original header =-
     4 http://sourceware.org/ml/libc-alpha/2009-01/msg00005.html
     5 
     6 From ea8ca0dfcbf2721bcf2c08ce3c01d5764b827572 Mon Sep 17 00:00:00 2001
     7 From: Ulrich Drepper <drepper@redhat.com>
     8 Date: Thu, 8 Jan 2009 00:42:28 +0000
     9 Subject: [PATCH] (re_compile_fastmap_iter): Rewrite COMPLEX_BRACKET handling.
    10 
    11 -= END original header =-
    12 
    13 diff -durN glibc-2_9.orig/posix/regcomp.c glibc-2_9/posix/regcomp.c
    14 --- glibc-2_9.orig/posix/regcomp.c	2008-05-15 05:07:21.000000000 +0200
    15 +++ glibc-2_9/posix/regcomp.c	2009-02-02 22:00:41.000000000 +0100
    16 @@ -350,47 +350,67 @@
    17  #ifdef RE_ENABLE_I18N
    18        else if (type == COMPLEX_BRACKET)
    19  	{
    20 -	  int i;
    21  	  re_charset_t *cset = dfa->nodes[node].opr.mbcset;
    22 -	  if (cset->non_match || cset->ncoll_syms || cset->nequiv_classes
    23 -	      || cset->nranges || cset->nchar_classes)
    24 -	    {
    25 +	  int i;
    26 +
    27  # ifdef _LIBC
    28 -	      if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0)
    29 +	  /* See if we have to try all bytes which start multiple collation
    30 +	     elements.
    31 +	     e.g. In da_DK, we want to catch 'a' since "aa" is a valid
    32 +		  collation element, and don't catch 'b' since 'b' is
    33 +		  the only collation element which starts from 'b' (and
    34 +		  it is caught by SIMPLE_BRACKET).  */
    35 +	      if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0
    36 +		  && (cset->ncoll_syms || cset->nranges))
    37  		{
    38 -		  /* In this case we want to catch the bytes which are
    39 -		     the first byte of any collation elements.
    40 -		     e.g. In da_DK, we want to catch 'a' since "aa"
    41 -			  is a valid collation element, and don't catch
    42 -			  'b' since 'b' is the only collation element
    43 -			  which starts from 'b'.  */
    44  		  const int32_t *table = (const int32_t *)
    45  		    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
    46  		  for (i = 0; i < SBC_MAX; ++i)
    47  		    if (table[i] < 0)
    48  		      re_set_fastmap (fastmap, icase, i);
    49  		}
    50 -# else
    51 -	      if (dfa->mb_cur_max > 1)
    52 -		for (i = 0; i < SBC_MAX; ++i)
    53 -		  if (__btowc (i) == WEOF)
    54 -		    re_set_fastmap (fastmap, icase, i);
    55 -# endif /* not _LIBC */
    56 -	    }
    57 -	  for (i = 0; i < cset->nmbchars; ++i)
    58 +# endif /* _LIBC */
    59 +
    60 +	  /* See if we have to start the match at all multibyte characters,
    61 +	     i.e. where we would not find an invalid sequence.  This only
    62 +	     applies to multibyte character sets; for single byte character
    63 +	     sets, the SIMPLE_BRACKET again suffices.  */
    64 +	  if (dfa->mb_cur_max > 1
    65 +	      && (cset->nchar_classes || cset->non_match
    66 +# ifdef _LIBC
    67 +		  || cset->nequiv_classes
    68 +# endif /* _LIBC */
    69 +		 ))
    70  	    {
    71 -	      char buf[256];
    72 -	      mbstate_t state;
    73 -	      memset (&state, '\0', sizeof (state));
    74 -	      if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1)
    75 -		re_set_fastmap (fastmap, icase, *(unsigned char *) buf);
    76 -	      if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
    77 +	      unsigned char c = 0;
    78 +	      do
    79  		{
    80 -		  if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state)
    81 -		      != (size_t) -1)
    82 -		    re_set_fastmap (fastmap, 0, *(unsigned char *) buf);
    83 +		  mbstate_t mbs;
    84 +		  memset (&mbs, 0, sizeof (mbs));
    85 +		  if (__mbrtowc (NULL, (char *) &c, 1, &mbs) == (size_t) -2)
    86 +		    re_set_fastmap (fastmap, false, (int) c);
    87  		}
    88 +	      while (++c != 0);
    89  	    }
    90 +
    91 +	  else
    92 +	    {
    93 +	      /* ... Else catch all bytes which can start the mbchars.  */
    94 +	      for (i = 0; i < cset->nmbchars; ++i)
    95 +		{
    96 +		  char buf[256];
    97 +		  mbstate_t state;
    98 +		  memset (&state, '\0', sizeof (state));
    99 +		  if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1)
   100 +		    re_set_fastmap (fastmap, icase, *(unsigned char *) buf);
   101 +		  if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
   102 +		    {
   103 +		      if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state)
   104 +			  != (size_t) -1)
   105 +			re_set_fastmap (fastmap, false, *(unsigned char *) buf);
   106 +		    }
   107 + 		}
   108 + 	    }
   109  	}
   110  #endif /* RE_ENABLE_I18N */
   111        else if (type == OP_PERIOD