diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-17 21:19:53 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-17 21:19:53 +0200 |
| commit | b95ee96e7528554fc3ee2c48fbd59d75c59148db (patch) | |
| tree | bf1d23f4f4172d59ecf38001c1ccc509f38b1af2 | |
| parent | 1e660422b16510f8bcdb764d632bb1da391c4a35 (diff) | |
| download | busybox-b95ee96e7528554fc3ee2c48fbd59d75c59148db.tar.gz | |
hush: smaller code in !READONLY configs
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/hush.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/shell/hush.c b/shell/hush.c index a68986329..2125e757d 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -9347,11 +9347,14 @@ static int helper_export_local(char **argv, } } # if ENABLE_HUSH_LOCAL - if (exp == 0 && ro == 0 /* local? */ - && var && var->func_nest_level == lvl + /* Is this "local" bltin? */ + if (exp == 0 + IF_HUSH_READONLY(&& ro == 0) /* in !READONLY config, always true */ ) { - /* "local x=abc; ...; local x" - ignore second local decl */ - continue; + if (var && var->func_nest_level == lvl) { + /* "local x=abc; ...; local x" - ignore second local decl */ + continue; + } } # endif /* Exporting non-existing variable. |