]> git.ipfire.org Git - ipfire-3.x.git/blob - bash/patches/bash-4.3-here-doc-ps2-comsub.patch0
Merge remote-tracking branch 'stevee/systemd-215'
[ipfire-3.x.git] / bash / patches / bash-4.3-here-doc-ps2-comsub.patch0
1 *** ../bash-4.3-patched/shell.h 2012-12-25 21:11:01.000000000 -0500
2 --- shell.h 2014-06-03 09:24:28.000000000 -0400
3 ***************
4 *** 169,173 ****
5 int expand_aliases;
6 int echo_input_at_read;
7 !
8 } sh_parser_state_t;
9
10 --- 169,174 ----
11 int expand_aliases;
12 int echo_input_at_read;
13 ! int need_here_doc;
14 !
15 } sh_parser_state_t;
16
17 *** ../bash-4.3-patched/parse.y 2014-05-14 09:16:40.000000000 -0400
18 --- parse.y 2014-04-30 09:27:59.000000000 -0400
19 ***************
20 *** 2643,2647 ****
21
22 r = 0;
23 ! while (need_here_doc)
24 {
25 parser_state |= PST_HEREDOC;
26 --- 2643,2647 ----
27
28 r = 0;
29 ! while (need_here_doc > 0)
30 {
31 parser_state |= PST_HEREDOC;
32 ***************
33 *** 6076,6079 ****
34 --- 6076,6080 ----
35 ps->expand_aliases = expand_aliases;
36 ps->echo_input_at_read = echo_input_at_read;
37 + ps->need_here_doc = need_here_doc;
38
39 ps->token = token;
40 ***************
41 *** 6124,6127 ****
42 --- 6125,6129 ----
43 expand_aliases = ps->expand_aliases;
44 echo_input_at_read = ps->echo_input_at_read;
45 + need_here_doc = ps->need_here_doc;
46
47 FREE (token);