diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2012-03-13 09:52:36 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2012-03-13 09:52:36 -0400 |
| commit | e6a6f4787f2073399985c1d696c01b8ae70fbcf0 (patch) | |
| tree | c04377f8817c77b817274bb38b1343b9c7cc7c9e | |
| parent | b3203139c0ad0bd9fa902d5e7d8bf9064a74775f (diff) | |
| download | bash-e6a6f4787f2073399985c1d696c01b8ae70fbcf0.tar.gz | |
Bash-4.2 direxpand with patch 21
| -rw-r--r-- | builtins/read.def | 4 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtins/read.def b/builtins/read.def index 1b87faae..4915220c 100644 --- 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 cb416d34..2ffa36e6 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 20 +#define PATCHLEVEL 21 #endif /* _PATCHLEVEL_H_ */ |