diff options
author | Ron Yorston <rmy@pobox.com> | 2024-12-30 14:45:15 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2024-12-30 14:45:15 +0000 |
commit | 370ce52cca8e7e8a341d5e238a79fd67f6048bb6 (patch) | |
tree | 48c78d906a4467bb618946d96574a5bc21cacfba /shell/hush.c | |
parent | dc3ee8e0523a4f651f3012ae1f5a181548187709 (diff) | |
parent | 14f57f5357cb674b88e7cdaff6267bf9d84c6b80 (diff) | |
download | busybox-w32-merge.tar.gz busybox-w32-merge.tar.bz2 busybox-w32-merge.zip |
Merge branch 'busybox' into mergemerge
Diffstat (limited to '')
-rw-r--r-- | shell/hush.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/shell/hush.c b/shell/hush.c index 04dda0734..4a97293cc 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -10361,6 +10361,9 @@ int hush_main(int argc, char **argv) | |||
10361 | _exit(0); | 10361 | _exit(0); |
10362 | } | 10362 | } |
10363 | G.argv0_for_re_execing = argv[0]; | 10363 | G.argv0_for_re_execing = argv[0]; |
10364 | if (G.argv0_for_re_execing[0] == '-') | ||
10365 | /* reexeced hush should never be a login shell */ | ||
10366 | G.argv0_for_re_execing++; | ||
10364 | #endif | 10367 | #endif |
10365 | #if ENABLE_HUSH_TRAP | 10368 | #if ENABLE_HUSH_TRAP |
10366 | # if ENABLE_HUSH_FUNCTIONS | 10369 | # if ENABLE_HUSH_FUNCTIONS |