diff options
author | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 20:00:10 -0500 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-22 20:00:10 -0500 |
commit | aeb26a67db0df058436b835363fc433e258719f3 (patch) | |
tree | b8bd22983562ce8c14016a4d1aab875da50e6ae0 | |
parent | d26fdfa0b92fcbc1e9bced7c4343e954db569105 (diff) | |
download | android_external_bash-aeb26a67db0df058436b835363fc433e258719f3.tar.gz android_external_bash-aeb26a67db0df058436b835363fc433e258719f3.tar.bz2 android_external_bash-aeb26a67db0df058436b835363fc433e258719f3.zip |
Bash-4.2 patch 4
-rw-r--r-- | patchlevel.h | 2 | ||||
-rw-r--r-- | subst.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/patchlevel.h b/patchlevel.h index 3f5e06c..2b93e97 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_ */ @@ -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); |