emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: speed up ${v//pattern/repl}

Browse Source 
function                                             old     new   delta
subevalvar                                          1447    1457     +10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-07-25 21:54:14 +02:00
parent 1310d7b1d1
commit 53d45c934f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
shell/ash.c
View File

@ -7284,7 +7284,7 @@ subevalvar(char *start, char *str, int strloc,
while (idx <= end) { while (idx <= end) {
try_to_match: try_to_match:
if (no_meta_len == 0) { if (no_meta_len == 0) {
/* pattern has meta chars, have to glob; or ENABLE_ASH_OPTIMIZE_FOR_SIZE */ /* pattern has meta chars, have to glob; or ENABLE_ASH_OPTIMIZE_FOR_SIZE */
loc = scanright(idx, rmesc, rmescend, str, quotes, /*match_at_start:*/ 1); loc = scanright(idx, rmesc, rmescend, str, quotes, /*match_at_start:*/ 1);
} else { } else {
/* Testcase for very slow replace (performs about 22k replaces): /* Testcase for very slow replace (performs about 22k replaces):
@ -7292,16 +7292,19 @@ subevalvar(char *start, char *str, int strloc,
* x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;echo ${#x} * x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;x=$x$x;echo ${#x}
* echo "${x//:/|}" * echo "${x//:/|}"
*/ */
size_t n;
if (strncmp(rmesc, str, no_meta_len) != 0) if (strncmp(rmesc, str, no_meta_len) != 0)
goto no_match; goto no_match;
n = no_meta_len;
loc = idx; loc = idx;
do { if (!quotes) {
if (quotes && (unsigned char)*loc == CTLESC) loc += no_meta_len;
} else {
size_t n = no_meta_len;
do {
if ((unsigned char)*loc == CTLESC)
loc++;
loc++; loc++;
loc++; } while (--n != 0);
} while (--n != 0); }
} }
//bb_error_msg("scanright('%s'):'%s'", str, loc); //bb_error_msg("scanright('%s'):'%s'", str, loc);
if (!loc) { if (!loc) {