diff options
author | Ron Yorston <rmy@pobox.com> | 2024-09-28 08:13:32 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2024-09-28 08:13:32 +0100 |
commit | 431e2704c17d5c0e51a0cbebfb1105bd4962b3f7 (patch) | |
tree | 6ff19e48cdcab8ba8176d22813d39a375399a610 /shell/ash.c | |
parent | 940f40e371695d6b247f4b406e7eb580fb91e866 (diff) | |
parent | dff444bc375e6eb4c6775dbfc753ba71b46e9797 (diff) | |
download | busybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.tar.gz busybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.tar.bz2 busybox-w32-431e2704c17d5c0e51a0cbebfb1105bd4962b3f7.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/ash.c')
-rw-r--r-- | shell/ash.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/shell/ash.c b/shell/ash.c index 8bbc19d1f..8a3659542 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -12821,16 +12821,12 @@ options(int *login_sh) | |||
12821 | if (val && (c == '-')) { /* long options */ | 12821 | if (val && (c == '-')) { /* long options */ |
12822 | if (strcmp(p, "login") == 0) { | 12822 | if (strcmp(p, "login") == 0) { |
12823 | *login_sh = 1; | 12823 | *login_sh = 1; |
12824 | #if ENABLE_PLATFORM_MINGW32 | ||
12825 | break; | 12824 | break; |
12826 | #endif | ||
12827 | } | 12825 | } |
12828 | /* TODO: --noprofile: e.g. if I want to run emergency shell from sulogin, | 12826 | /* TODO: --noprofile: e.g. if I want to run emergency shell from sulogin, |
12829 | * I want minimal/no shell init scripts - but it insists on running it as "-ash"... | 12827 | * I want minimal/no shell init scripts - but it insists on running it as "-ash"... |
12830 | */ | 12828 | */ |
12831 | #if !ENABLE_PLATFORM_MINGW32 | 12829 | ash_msg_and_raise_error("bad option '%s'", p - 2); |
12832 | break; | ||
12833 | #endif | ||
12834 | } | 12830 | } |
12835 | } | 12831 | } |
12836 | if (c == 'o') { | 12832 | if (c == 'o') { |