diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 20:02:46 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 20:02:46 -0500 |
| commit | 25db9a70d4c2ba5c43d4167f231bdd8d760d5a06 (patch) | |
| tree | 2cf2d0898517078f89ac26569c9ec5cb0e4eb7fc | |
| parent | a48a8ac3526e4395f086945cf986d0fea378870b (diff) | |
| download | android_external_bash-25db9a70d4c2ba5c43d4167f231bdd8d760d5a06.tar.gz android_external_bash-25db9a70d4c2ba5c43d4167f231bdd8d760d5a06.tar.bz2 android_external_bash-25db9a70d4c2ba5c43d4167f231bdd8d760d5a06.zip | |
Bash-4.2 patch 14
| -rw-r--r-- | patchlevel.h | 2 | ||||
| -rw-r--r-- | pathexp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/patchlevel.h b/patchlevel.h index 636be1c..04b423b 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 13 +#define PATCHLEVEL 14 #endif /* _PATCHLEVEL_H_ */ @@ -196,7 +196,7 @@ quote_string_for_globbing (pathname, qflags) { if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') continue; - if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) + if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) continue; temp[j++] = '\\'; i++; |