Bash-4.2 patch 4

diff --git a/patchlevel.h b/patchlevel.h
index 3f5e06c9a5db4c14306fdc7804a2e16c7a780bca..2b93e977ae10c0032b3cc2725c8514fe6284ca0e 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 7ba15c6293a7111fd187399eebab1b2558944ede..83b23dddf209cabe1374e34f8624fd75d983e638 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);