summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2011-11-22 20:00:10 -0500
committerChet Ramey <chet.ramey@case.edu>2011-11-22 20:00:10 -0500
commitaeb26a67db0df058436b835363fc433e258719f3 (patch)
treeb8bd22983562ce8c14016a4d1aab875da50e6ae0
parentd26fdfa0b92fcbc1e9bced7c4343e954db569105 (diff)
downloadbash-aeb26a67db0df058436b835363fc433e258719f3.tar.gz
Bash-4.2 patch 4
-rw-r--r--patchlevel.h2
-rw-r--r--subst.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/patchlevel.h b/patchlevel.h
index 3f5e06c9..2b93e977 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 3
+#define PATCHLEVEL 4
#endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index 7ba15c62..83b23ddd 100644
--- 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);