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

Bash-4.2 patch 7
---

diff --git a/patchlevel.h b/patchlevel.h
index 2a6db0ebc..52efbd769 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 6
+#define PATCHLEVEL 7
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index 83b23dddf..b23610eeb 100644
--- 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;