From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 23 Nov 2011 01:00:10 +0000 (-0500)
Subject: Bash-4.2 patch 4
X-Git-Tag: bash-4.3~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeb26a67db0df058436b835363fc433e258719f3;p=thirdparty%2Fbash.git

Bash-4.2 patch 4
---

diff --git a/patchlevel.h b/patchlevel.h
index 3f5e06c9a..2b93e977a 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 7ba15c629..83b23dddf 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);