diff options
author | Ron Yorston <rmy@pobox.com> | 2021-05-14 08:17:12 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-05-14 08:17:12 +0100 |
commit | a3f5a1b7f4275f713acf22f534f95c0da8392e53 (patch) | |
tree | 49b65422a3e9c33f508da9ccf3ae79d324bd9e96 /libbb/lineedit.c | |
parent | 375cda9a88024135d630ca8990d9aff4ea414e89 (diff) | |
parent | 7de0ab21d939a5a304157f75918d0318a95261a3 (diff) | |
download | busybox-w32-a3f5a1b7f4275f713acf22f534f95c0da8392e53.tar.gz busybox-w32-a3f5a1b7f4275f713acf22f534f95c0da8392e53.tar.bz2 busybox-w32-a3f5a1b7f4275f713acf22f534f95c0da8392e53.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/lineedit.c')
-rw-r--r-- | libbb/lineedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index c20436270..e7de32250 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
@@ -1157,7 +1157,7 @@ static NOINLINE int build_match_prefix(char *match_buf) | |||
1157 | continue; | 1157 | continue; |
1158 | for (--i; i >= 0; i--) { | 1158 | for (--i; i >= 0; i--) { |
1159 | int cur = int_buf[i]; | 1159 | int cur = int_buf[i]; |
1160 | if (cur == ' ' || cur == '<' || cur == '>' || cur == '|' || cur == '&') { | 1160 | if (cur == ' ' || cur == '<' || cur == '>' || cur == '|' || cur == '&' || cur == '=') { |
1161 | remove_chunk(int_buf, 0, i + 1); | 1161 | remove_chunk(int_buf, 0, i + 1); |
1162 | break; | 1162 | break; |
1163 | } | 1163 | } |
@@ -1426,7 +1426,7 @@ static NOINLINE void input_tab(smallint *lastWasTab) | |||
1426 | strcpy(&command[cursor_mb], chosen_match + match_pfx_len); | 1426 | strcpy(&command[cursor_mb], chosen_match + match_pfx_len); |
1427 | len = load_string(command); | 1427 | len = load_string(command); |
1428 | /* add match and tail */ | 1428 | /* add match and tail */ |
1429 | sprintf(&command[cursor_mb], "%s%s", chosen_match + match_pfx_len, match_buf); | 1429 | stpcpy(stpcpy(&command[cursor_mb], chosen_match + match_pfx_len), match_buf); |
1430 | command_len = load_string(command); | 1430 | command_len = load_string(command); |
1431 | /* write out the matched command */ | 1431 | /* write out the matched command */ |
1432 | /* paranoia: load_string can return 0 on conv error, | 1432 | /* paranoia: load_string can return 0 on conv error, |