rpms/bash/devel bash-subshell.patch,NONE,1.1 bash.spec,1.87,1.88

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19459

Modified Files:
	bash.spec 
Added Files:
	bash-subshell.patch 
Log Message:
* Tue Nov 22 2005 Tim Waugh <twaugh at redhat.com>
- Applied patch from upstream to fix parsing problem (bug #146638).


bash-subshell.patch:
 parse.y |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE bash-subshell.patch ---
--- bash-3.0/parse.y.subshell	2005-11-22 13:19:11.000000000 +0000
+++ bash-3.0/parse.y	2005-11-22 13:19:24.000000000 +0000
@@ -2055,14 +2055,6 @@
   if (uc)
     shell_input_line_index++;
 
-  if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
-    {
-	if (SHOULD_PROMPT ())
-	  prompt_again ();
-	line_number++;
-	goto restart_read;
-    }
-
 #if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
   /* If UC is NULL, we have reached the end of the current input string.  If
      pushed_string_list is non-empty, it's time to pop to the previous string
@@ -2078,6 +2070,14 @@
     }
 #endif /* ALIAS || DPAREN_ARITHMETIC */
 
+  if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
+    {
+	if (SHOULD_PROMPT ())
+	  prompt_again ();
+	line_number++;
+	goto restart_read;
+    }
+
   if (!uc && shell_input_line_terminator == EOF)
     return ((shell_input_line_index != 0) ? '\n' : EOF);
 


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- bash.spec	9 Nov 2005 16:05:00 -0000	1.87
+++ bash.spec	22 Nov 2005 13:33:55 -0000	1.88
@@ -56,6 +56,7 @@
 Patch125: bash-afs.patch
 Patch126: bash-setlocale.patch
 Patch127: bash-sighandler.patch
+Patch128: bash-subshell.patch
 Prefix: %{_prefix}
 Requires: mktemp
 Obsoletes: bash2 etcskel
@@ -125,6 +126,7 @@
 %patch125 -p1 -b .afs
 %patch126 -p1 -b .setlocale
 %patch127 -p1 -b .sighandler
+%patch128 -p1 -b .subshell
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -257,6 +259,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Tue Nov 22 2005 Tim Waugh <twaugh at redhat.com>
+- Applied patch from upstream to fix parsing problem (bug #146638).
+
 * Wed Nov  9 2005 Tim Waugh <twaugh at redhat.com> 3.0-36
 - Added Url: tag (bug #172770).
 - Do not explicitly gzip info pages (bug #172770).