Bash-4.2 direxpand with patch 21

diff --git a/builtins/read.def b/builtins/read.def
index 1b87faaefb6f61ca6505f1ffc1aef232a957e059..4915220c370b0f59c16973a46e7ed7b6300876e5 100644 (file)
--- a/builtins/read.def
+++ b/builtins/read.def
@@ -737,7 +737,7 @@ assign_vars:
              xfree (t1);
            }
          else
-           var = bind_read_variable (varname, t);
+           var = bind_read_variable (varname, t ? t : "");
        }
       else
        {
@@ -798,7 +798,7 @@ assign_vars:
       xfree (t);
     }
   else
-    var = bind_read_variable (list->word->word, input_string);
+    var = bind_read_variable (list->word->word, input_string ? input_string : "");
 
   if (var)
     {

diff --git a/patchlevel.h b/patchlevel.h
index cb416d34534511a589ccaa235e972b602875055d..2ffa36e6730477e937a54333fcadd6d9964b4e9d 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 20
+#define PATCHLEVEL 21
 
 #endif /* _PATCHLEVEL_H_ */