From 43aebe922bc2a614c410e282fdf772e063454168 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Thu, 7 Mar 2013 15:20:58 -0500 Subject: [PATCH] Bash-4.2 patch 43 --- -i | 0 builtins/read.def | 16 +++++++++++++--- patchlevel.h | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 -i diff --git a/-i b/-i new file mode 100644 index 0000000..e69de29 diff --git a/builtins/read.def b/builtins/read.def index e32dec7..d407857 100644 --- a/builtins/read.def +++ b/builtins/read.def @@ -385,10 +385,20 @@ read_builtin (list) { /* Tricky. The top of the unwind-protect stack is the free of input_string. We want to run all the rest and use input_string, - so we have to remove it from the stack. */ - remove_unwind_protect (); - run_unwind_frame ("read_builtin"); + so we have to save input_string temporarily, run the unwind- + protects, then restore input_string so we can use it later. */ + input_string[i] = '\0'; /* make sure it's terminated */ + if (i == 0) + { + t = (char *)xmalloc (1); + t[0] = 0; + } + else + t = savestring (input_string); + + run_unwind_frame ("read_builtin"); + input_string = t; retval = 128+SIGALRM; goto assign_vars; } diff --git a/patchlevel.h b/patchlevel.h index 10e294f..4c2cf1d 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 42 +#define PATCHLEVEL 43 #endif /* _PATCHLEVEL_H_ */ -- 2.7.4