Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-shells/bash/files: bash-4.3-here-doc-ps2-comsub.patch
Date: Thu, 05 Jun 2014 06:30:22
Message-Id: 20140605063018.BCBC12004F@flycatcher.gentoo.org
1 polynomial-c 14/06/05 06:30:18
2
3 Added: bash-4.3-here-doc-ps2-comsub.patch
4 Log:
5 Added upstream fix
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
8
9 Revision Changes Path
10 1.1 app-shells/bash/files/bash-4.3-here-doc-ps2-comsub.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-4.3-here-doc-ps2-comsub.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-4.3-here-doc-ps2-comsub.patch?rev=1.1&content-type=text/plain
14
15 Index: bash-4.3-here-doc-ps2-comsub.patch
16 ===================================================================
17 *** ../bash-4.3-patched/shell.h 2012-12-25 21:11:01.000000000 -0500
18 --- shell.h 2014-06-03 09:24:28.000000000 -0400
19 ***************
20 *** 169,173 ****
21 int expand_aliases;
22 int echo_input_at_read;
23 !
24 } sh_parser_state_t;
25
26 --- 169,174 ----
27 int expand_aliases;
28 int echo_input_at_read;
29 ! int need_here_doc;
30 !
31 } sh_parser_state_t;
32
33 *** ../bash-4.3-patched/parse.y 2014-05-14 09:16:40.000000000 -0400
34 --- parse.y 2014-04-30 09:27:59.000000000 -0400
35 ***************
36 *** 2643,2647 ****
37
38 r = 0;
39 ! while (need_here_doc)
40 {
41 parser_state |= PST_HEREDOC;
42 --- 2643,2647 ----
43
44 r = 0;
45 ! while (need_here_doc > 0)
46 {
47 parser_state |= PST_HEREDOC;
48 ***************
49 *** 6076,6079 ****
50 --- 6076,6080 ----
51 ps->expand_aliases = expand_aliases;
52 ps->echo_input_at_read = echo_input_at_read;
53 + ps->need_here_doc = need_here_doc;
54
55 ps->token = token;
56 ***************
57 *** 6124,6127 ****
58 --- 6125,6129 ----
59 expand_aliases = ps->expand_aliases;
60 echo_input_at_read = ps->echo_input_at_read;
61 + need_here_doc = ps->need_here_doc;
62
63 FREE (token);