bash/bash-4.3-noecho.patch

43 lines
1.2 KiB
Diff
Raw Normal View History

2017-01-06 13:41:12 +00:00
diff --git a/parse.y b/parse.y
--- a/parse.y
+++ b/parse.y
@@ -4255,7 +4255,8 @@ xparse_dolparen (base, string, indp, flags)
save_parser_state (&ps);
save_input_line_state (&ls);
-
+ /* avoid echoing every substitution again */
+ echo_input_at_read = 0;
#if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
pushed_string_list = (STRING_SAVER *)NULL;
#endif
2017-01-06 13:41:12 +00:00
diff --git a/subst.c b/subst.c
--- a/subst.c
+++ b/subst.c
@@ -10222,6 +10222,7 @@ param_expand (string, sindex, quoted, expanded_something,
2021-01-06 09:48:34 +00:00
WORD_LIST *list, *l;
WORD_DESC *tdesc, *ret;
2021-01-06 09:48:34 +00:00
int tflag, nullarg;
+ int old_echo_input;
2017-01-06 13:41:12 +00:00
/*itrace("param_expand: `%s' pflags = %d", string+*sindex, pflags);*/
zindex = *sindex;
@@ -10614,6 +10615,9 @@ arithsub:
}
comsub:
+ old_echo_input = echo_input_at_read;
+ /* avoid echoing every substitution again */
+ echo_input_at_read = 0;
if (pflags & PF_NOCOMSUB)
/* we need zindex+1 because string[zindex] == RPAREN */
temp1 = substring (string, *sindex, zindex+1);
@@ -10626,6 +10630,7 @@ comsub:
}
FREE (temp);
temp = temp1;
+ echo_input_at_read = old_echo_input;
break;
/* Do POSIX.2d9-style arithmetic substitution. This will probably go