[gentoo-commits] gentoo-x86 commit in app-shells/bash/files: bash-4.0-read-timeout-reset.patch

[gentoo-commits] gentoo-x86 commit in app-shells/bash/files: bash-4.0-read-timeout-reset.patch

[Mike Frysinger (vapier)]

vapier      09/03/03 19:58:53

  Added:                bash-4.0-read-timeout-reset.patch
  Log:
  Add fix from upstream for read timeouts.
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-shells/bash/files/bash-4.0-read-timeout-reset.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-read-timeout-reset.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-read-timeout-reset.patch?rev=1.1&content-type=text/plain

Index: bash-4.0-read-timeout-reset.patch
===================================================================
http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00255.html
http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00008.html

*** ../bash-4.0/builtins/read.def	2009-01-15 23:11:21.000000000 -0500
--- builtins/read.def	2009-03-02 10:15:39.000000000 -0500
***************
*** 370,381 ****
        if (code)
  	{
! #if 0
  	  run_unwind_frame ("read_builtin");
- 	  return (EXECUTION_FAILURE);
- #else
  	  input_string[i] = '\0';	/* make sure it's terminated */
! 	  retval = 128+SIGALRM;;
  	  goto assign_vars;
- #endif
  	}
        old_alrm = set_signal_handler (SIGALRM, sigalrm);
--- 370,381 ----
        if (code)
  	{
! 	  /* 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");
  	  input_string[i] = '\0';	/* make sure it's terminated */
! 	  retval = 128+SIGALRM;
  	  goto assign_vars;
  	}
        old_alrm = set_signal_handler (SIGALRM, sigalrm);