From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in app-shells/bash/files: bash-4.0-read-timeout-reset.patch |
Date: | Wed, 04 Mar 2009 01:22:49 |
Message-Id: | E1LealR-0005Yn-ET@stork.gentoo.org |
1 | vapier 09/03/03 19:58:53 |
2 | |
3 | Added: bash-4.0-read-timeout-reset.patch |
4 | Log: |
5 | Add fix from upstream for read timeouts. |
6 | (Portage version: 2.2_rc23/cvs/Linux x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.1 app-shells/bash/files/bash-4.0-read-timeout-reset.patch |
10 | |
11 | 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 |
12 | 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 |
13 | |
14 | Index: bash-4.0-read-timeout-reset.patch |
15 | =================================================================== |
16 | http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00255.html |
17 | http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00008.html |
18 | |
19 | *** ../bash-4.0/builtins/read.def 2009-01-15 23:11:21.000000000 -0500 |
20 | --- builtins/read.def 2009-03-02 10:15:39.000000000 -0500 |
21 | *************** |
22 | *** 370,381 **** |
23 | if (code) |
24 | { |
25 | ! #if 0 |
26 | run_unwind_frame ("read_builtin"); |
27 | - return (EXECUTION_FAILURE); |
28 | - #else |
29 | input_string[i] = '\0'; /* make sure it's terminated */ |
30 | ! retval = 128+SIGALRM;; |
31 | goto assign_vars; |
32 | - #endif |
33 | } |
34 | old_alrm = set_signal_handler (SIGALRM, sigalrm); |
35 | --- 370,381 ---- |
36 | if (code) |
37 | { |
38 | ! /* Tricky. The top of the unwind-protect stack is the free of |
39 | ! input_string. We want to run all the rest and use input_string, |
40 | ! so we have to remove it from the stack. */ |
41 | ! remove_unwind_protect (); |
42 | run_unwind_frame ("read_builtin"); |
43 | input_string[i] = '\0'; /* make sure it's terminated */ |
44 | ! retval = 128+SIGALRM; |
45 | goto assign_vars; |
46 | } |
47 | old_alrm = set_signal_handler (SIGALRM, sigalrm); |