diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-01-13 09:11:24 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-01-13 09:11:24 +0000 |
| commit | e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c (patch) | |
| tree | af786c447cae6ca59e195b31fbae442c0b42d198 /shell | |
| parent | 215f730e98215bff8dfacafdaa70e4a11395ad53 (diff) | |
| parent | 0f592d7fb94c5887528d0ee24020c2225ab71c28 (diff) | |
| download | busybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.tar.gz busybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.tar.bz2 busybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.zip | |
Merge branch 'busybox' into merge
Conflicts:
include/platform.h
scripts/basic/fixdep.c
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index d104aea1d..a916f2772 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -13616,7 +13616,7 @@ init(void) | |||
| 13616 | setvar2("PPID", utoa(getppid())); | 13616 | setvar2("PPID", utoa(getppid())); |
| 13617 | #if ENABLE_ASH_BASH_COMPAT | 13617 | #if ENABLE_ASH_BASH_COMPAT |
| 13618 | p = lookupvar("SHLVL"); | 13618 | p = lookupvar("SHLVL"); |
| 13619 | setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1)); | 13619 | setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT); |
| 13620 | #endif | 13620 | #endif |
| 13621 | p = lookupvar("PWD"); | 13621 | p = lookupvar("PWD"); |
| 13622 | if (p) { | 13622 | if (p) { |