]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blob - bash/patches/bash-4.3-noecho.patch
ppp: Re-add ifname patch
[people/ms/ipfire-3.x.git] / bash / patches / bash-4.3-noecho.patch
1 --- bash-4.3/parse.y 2014-05-29 14:46:09.545543384 +0200
2 +++ bash-4.3/parse.y 2014-05-29 14:48:40.758626213 +0200
3 @@ -3858,6 +3858,8 @@ xparse_dolparen (base, string, indp, fla
4 save_parser_state (&ps);
5 save_input_line_state (&ls);
6 orig_eof_token = shell_eof_token;
7 + /* avoid echoing every substitution again */
8 + echo_input_at_read = 0;
9
10 /*(*/
11 parser_state |= PST_CMDSUBST|PST_EOFTOKEN; /* allow instant ')' */ /*(*/
12 --- bash-4.3/subst.c 2014-05-29 16:04:35.802784549 +0200
13 +++ bash-4.3/subst.c 2014-05-29 16:08:25.021942676 +0200
14 @@ -7103,6 +7103,7 @@ param_expand (string, sindex, quoted, ex
15 WORD_LIST *list;
16 WORD_DESC *tdesc, *ret;
17 int tflag;
18 + int old_echo_input;
19
20 zindex = *sindex;
21 c = string[++zindex];
22 @@ -7401,6 +7402,9 @@ arithsub:
23 }
24
25 comsub:
26 + old_echo_input = echo_input_at_read;
27 + /* avoid echoing every substitution again */
28 + echo_input_at_read = 0;
29 if (pflags & PF_NOCOMSUB)
30 /* we need zindex+1 because string[zindex] == RPAREN */
31 temp1 = substring (string, *sindex, zindex+1);
32 @@ -7413,6 +7417,7 @@ comsub:
33 }
34 FREE (temp);
35 temp = temp1;
36 + echo_input_at_read = old_echo_input;
37 break;
38
39 /* Do POSIX.2d9-style arithmetic substitution. This will probably go