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:
3a5aaa2
)
applying bash42-004
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
3f5e06c
..
2b93e97
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
3
+#define PATCHLEVEL
4
#endif /* _PATCHLEVEL_H_ */
diff --git
a/subst.c
b/subst.c
index
7ba15c6
..
83b23dd
100644
(file)
--- a/
subst.c
+++ b/
subst.c
@@
-3373,7
+3373,7
@@
expand_string_for_rhs (string, quoted, dollar_at_p, has_dollar_at)
if (string == 0 || *string == '\0')
return (WORD_LIST *)NULL;
- td.flags =
0;
+ td.flags =
W_NOSPLIT2; /* no splitting, remove "" and '' */
td.word = string;
tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at);
return (tresult);