From: Chet Ramey Date: Mon, 7 May 2012 20:23:18 +0000 (-0400) Subject: Bash-4.2 patch 27 X-Git-Tag: bash-4.3~20 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fbash.git;a=commitdiff_plain;h=91717ba3b24d1ed49c47b35b88cf3d44c2eb0dc3 Bash-4.2 patch 27 --- diff --git a/patchlevel.h b/patchlevel.h index b5a234ff8..5e31cd4a0 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 26 +#define PATCHLEVEL 27 #endif /* _PATCHLEVEL_H_ */ diff --git a/subst.c b/subst.c index c9a06788f..b6476d8a7 100644 --- a/subst.c +++ b/subst.c @@ -4166,7 +4166,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