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

hush: speed up ${var:+ARG} for literal ARGs

Browse Source 
function                                             old     new   delta
first_special_char_in_vararg                           -      52     +52
expand_one_var                                      2248    2296     +48
encode_then_expand_vararg                            357     336     -21
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/1 up/down: 100/-21)            Total: 79 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-07-31 10:36:29 +02:00
parent a5db1d7354
commit 54fdabda3b
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
shell/hush.c
View File

@ -5913,6 +5913,26 @@ static char *encode_then_expand_string(const char *str)
return exp_str; return exp_str;
} }
static const char *first_special_char_in_vararg(const char *cp)
{
for (;;) {
if (!*cp) return NULL; /* string has no special chars */
if (*cp == '$') return cp;
if (*cp == '\\') return cp;
if (*cp == '\'') return cp;
if (*cp == '"') return cp;
#if ENABLE_HUSH_TICK
if (*cp == '`') return cp;
#endif
/* dquoted "${x:+ARG}" should not glob, therefore
* '*' et al require some non-literal processing: */
if (*cp == '*') return cp;
if (*cp == '?') return cp;
if (*cp == '[') return cp;
cp++;
}
}
/* Expanding ARG in ${var#ARG}, ${var%ARG}, or ${var/ARG/ARG}. /* Expanding ARG in ${var#ARG}, ${var%ARG}, or ${var/ARG/ARG}.
* These can contain single- and double-quoted strings, * These can contain single- and double-quoted strings,
* and treated as if the ARG string is initially unquoted. IOW: * and treated as if the ARG string is initially unquoted. IOW:
@ -5932,19 +5952,10 @@ static char *encode_then_expand_vararg(const char *str, int handle_squotes, int
char *exp_str; char *exp_str;
struct in_str input; struct in_str input;
o_string dest = NULL_O_STRING; o_string dest = NULL_O_STRING;
const char *cp;
cp = str; if (!first_special_char_in_vararg(str)) {
for (;;) { /* string has no special chars */
if (!*cp) return NULL; /* string has no special chars */ return NULL;
if (*cp == '$') break;
if (*cp == '\\') break;
if (*cp == '\'') break;
if (*cp == '"') break;
#if ENABLE_HUSH_TICK
if (*cp == '`') break;
#endif
cp++;
} }
setup_string_in_str(&input, str); setup_string_in_str(&input, str);
@ -6025,26 +6036,19 @@ static char *encode_then_expand_vararg(const char *str, int handle_squotes, int
/* Expanding ARG in ${var+ARG}, ${var-ARG} /* Expanding ARG in ${var+ARG}, ${var-ARG}
*/ */
static int encode_then_append_var_plusminus(o_string *output, int n, static int encode_then_append_var_plusminus(o_string *output, int n,
const char *str, int dquoted) char *str, int dquoted)
{ {
struct in_str input; struct in_str input;
o_string dest = NULL_O_STRING; o_string dest = NULL_O_STRING;
#if 0 //todo? if (!first_special_char_in_vararg(str)
const char *cp; && '\0' == str[strcspn(str, G.ifs)]
cp = str; ) {
for (;;) { /* string has no special chars
if (!*cp) return NULL; /* string has no special chars */ * && string has no $IFS chars
if (*cp == '$') break; */
if (*cp == '\\') break; return expand_vars_to_list(output, n, str);
if (*cp == '\'') break;
if (*cp == '"') break;
#if ENABLE_HUSH_TICK
if (*cp == '`') break;
#endif
cp++;
} }
#endif
setup_string_in_str(&input, str); setup_string_in_str(&input, str);