summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-05-20 14:37:53 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-05-20 14:37:53 (GMT)
commitee0775dd13a84316f6fd49c930237e6dec241dba (patch)
tree91ab9fbce3c3f2a3125434c3b2c0f20dd23077b6
parente3be7842be3ccac389efd2ac51b18773c58852c5 (diff)
downloadbusybox-ee0775dd13a84316f6fd49c930237e6dec241dba.tar.gz
busybox-ee0775dd13a84316f6fd49c930237e6dec241dba.tar.bz2
hush: small code shrink
function old new delta expand_vars_to_list 2012 1999 -13 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/hush.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 824a5b5..d5cea07 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2569,7 +2569,7 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg, char
default: /* <SPECIAL_VAR_SYMBOL>varname<SPECIAL_VAR_SYMBOL> */
case_default: {
char *var = arg;
- bool exp_len;
+ char exp_len; /* '#' if it's ${#var} */
char exp_op;
char exp_save = exp_save; /* for compiler */
char *exp_saveptr = exp_saveptr; /* points to expansion operator */
@@ -2579,12 +2579,11 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg, char
arg[0] = first_ch & 0x7f;
/* prepare for expansions */
- exp_len = false;
exp_op = 0;
- if (var[0] == '#') {
+ exp_len = var[0];
+ if (exp_len == '#') {
/* handle length expansion ${#var} */
- exp_len = true;
- ++var;
+ var++;
} else {
/* maybe handle parameter expansion */
exp_saveptr = var + strcspn(var, ":-=+?%#");
@@ -2609,8 +2608,8 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg, char
val = get_local_var_value(var);
/* handle any expansions */
- if (exp_len) {
- debug_printf_expand("expand: length of '%s' = ", val);
+ if (exp_len == '#') {
+ debug_printf_expand("expand: length(%s)=", val);
val = utoa(val ? strlen(val) : 0);
debug_printf_expand("%s\n", val);
} else if (exp_op) {