diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2012-05-07 16:23:18 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2012-05-07 16:23:18 -0400 |
| commit | 91717ba3b24d1ed49c47b35b88cf3d44c2eb0dc3 (patch) | |
| tree | 3ed9284d6fa4c13d5d29d7c5d148e75482deb296 | |
| parent | 723479771597fa6dbbe6353aedf18e90f80afab5 (diff) | |
| download | bash-91717ba3b24d1ed49c47b35b88cf3d44c2eb0dc3.tar.gz | |
Bash-4.2 patch 27
| -rw-r--r-- | patchlevel.h | 2 | ||||
| -rw-r--r-- | subst.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/patchlevel.h b/patchlevel.h index b5a234ff..5e31cd4a 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_ */ @@ -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 |