projects
/
platform
/
upstream
/
bash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a48a8ac
)
Bash-4.2 patch 14
author
Chet Ramey
<chet.ramey@case.edu>
Wed, 23 Nov 2011 01:02:46 +0000
(20:02 -0500)
committer
Chet Ramey
<chet.ramey@case.edu>
Wed, 23 Nov 2011 01:02:46 +0000
(20:02 -0500)
patchlevel.h
patch
|
blob
|
history
pathexp.c
patch
|
blob
|
history
diff --git
a/patchlevel.h
b/patchlevel.h
index
636be1c
..
04b423b
100644
(file)
--- 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 1
3
+#define PATCHLEVEL 1
4
#endif /* _PATCHLEVEL_H_ */
diff --git
a/pathexp.c
b/pathexp.c
index
42f21e4
..
f239956
100644
(file)
--- a/
pathexp.c
+++ b/
pathexp.c
@@
-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++;