RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: bash Date: 09-May-2009 18:15:46
Branch: HEAD Handle: 2009050916154600
Modified files:
bash patchlevel.h
bash/builtins read.def
Log:
- jbj: apply bash40-009.
Summary:
Revision Changes Path
1.2 +5 -5 bash/builtins/read.def
1.10 +1 -1 bash/patchlevel.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: bash/builtins/read.def
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 read.def
--- bash/builtins/read.def 9 May 2009 14:32:14 -0000 1.1.1.1
+++ bash/builtins/read.def 9 May 2009 16:15:46 -0000 1.2
@@ -369,14 +369,14 @@
code = setjmp (alrmbuf);
if (code)
{
-#if 0
+ /* 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");
- return (EXECUTION_FAILURE);
-#else
input_string[i] = '\0'; /* make sure it's terminated */
- retval = 128+SIGALRM;;
+ retval = 128+SIGALRM;
goto assign_vars;
-#endif
}
old_alrm = set_signal_handler (SIGALRM, sigalrm);
add_unwind_protect (reset_alarm, (char *)NULL);
@@ .
patch -p0 <<'@@ .'
Index: bash/patchlevel.h
============================================================================
$ cvs diff -u -r1.9 -r1.10 patchlevel.h
--- bash/patchlevel.h 9 May 2009 16:15:12 -0000 1.9
+++ bash/patchlevel.h 9 May 2009 16:15:46 -0000 1.10
@@ -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 8
+#define PATCHLEVEL 9
#endif /* _PATCHLEVEL_H_ */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
