[gentoo-commits] gentoo-x86 commit in app-shells/bash/files: bash-4.2-extglob-multibyte.patch

[gentoo-commits] gentoo-x86 commit in app-shells/bash/files: bash-4.2-extglob-multibyte.patch

[Mike Frysinger (vapier)]

vapier      12/04/23 04:24:54

  Added:                bash-4.2-extglob-multibyte.patch
  Log:
  Add fix from upstream for multibyte string replaces in extglob mode #412867 by mva.
  
  (Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-shells/bash/files/bash-4.2-extglob-multibyte.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-4.2-extglob-multibyte.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-4.2-extglob-multibyte.patch?rev=1.1&content-type=text/plain

Index: bash-4.2-extglob-multibyte.patch
===================================================================
https://bugs.gentoo.org/412867
http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html

From: Andreas Schwab <schwab@linux-m68k.org>
To: Mike Frysinger <vapier@gentoo.org>
Cc: bug-bash@gnu.org
Subject: Re: string replace with multibyte chars and extglob fails with bash-4.2

diff --git a/subst.c b/subst.c
index 9feaa9c..ebd5138 100644
--- a/subst.c
+++ b/subst.c
@@ -4161,7 +4161,7 @@ match_wpattern (wstring, indices, wstrlen, wpat, mtype, sp, ep)
   simple = (wpat[0] != L'\\' && wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'[');
 #if defined (EXTENDED_GLOB)
   if (extended_glob)
-    simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
+    simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
 #endif
 
   /* If the pattern doesn't match anywhere in the string, go ahead and