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:
dbbd655
)
applying bash42-007
author
Anas Nashif
<anas.nashif@intel.com>
Sat, 8 Dec 2012 08:34:11 +0000
(
00:34
-0800)
committer
Anas Nashif
<anas.nashif@intel.com>
Sat, 8 Dec 2012 08:34:11 +0000
(
00:34
-0800)
patchlevel.h
patch
|
blob
|
history
subst.c
patch
|
blob
|
history
diff --git
a/patchlevel.h
b/patchlevel.h
index
2a6db0e
..
52efbd7
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
6
+#define PATCHLEVEL
7
#endif /* _PATCHLEVEL_H_ */
diff --git
a/subst.c
b/subst.c
index
83b23dd
..
b23610e
100644
(file)
--- a/
subst.c
+++ b/
subst.c
@@
-4609,6
+4609,7
@@
expand_word_unsplit (word, quoted)
if (ifs_firstc == 0)
#endif
word->flags |= W_NOSPLIT;
+ word->flags |= W_NOSPLIT2;
result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL);
expand_no_split_dollar_star = 0;