diff options
Diffstat (limited to '')
| -rw-r--r-- | shell/ash.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/shell/ash.c b/shell/ash.c index 3722c2c23..ae49687da 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -16380,14 +16380,11 @@ init(void) | |||
| 16380 | * Process the shell command line arguments. | 16380 | * Process the shell command line arguments. |
| 16381 | */ | 16381 | */ |
| 16382 | static int | 16382 | static int |
| 16383 | procargs(char **argv) | 16383 | procargs(char **xargv) |
| 16384 | { | 16384 | { |
| 16385 | int i; | 16385 | int i; |
| 16386 | const char *xminusc; | ||
| 16387 | char **xargv; | ||
| 16388 | int login_sh; | 16386 | int login_sh; |
| 16389 | 16387 | ||
| 16390 | xargv = argv; | ||
| 16391 | #if ENABLE_PLATFORM_MINGW32 | 16388 | #if ENABLE_PLATFORM_MINGW32 |
| 16392 | login_sh = applet_name[0] == 'l'; | 16389 | login_sh = applet_name[0] == 'l'; |
| 16393 | #else | 16390 | #else |
| @@ -16408,9 +16405,8 @@ procargs(char **argv) | |||
| 16408 | raise_exception(EXERROR); /* does not return */ | 16405 | raise_exception(EXERROR); /* does not return */ |
| 16409 | } | 16406 | } |
| 16410 | xargv = argptr; | 16407 | xargv = argptr; |
| 16411 | xminusc = minusc; | ||
| 16412 | if (*xargv == NULL) { | 16408 | if (*xargv == NULL) { |
| 16413 | if (xminusc) | 16409 | if (minusc) |
| 16414 | ash_msg_and_raise_error(bb_msg_requires_arg, "-c"); | 16410 | ash_msg_and_raise_error(bb_msg_requires_arg, "-c"); |
| 16415 | sflag = 1; | 16411 | sflag = 1; |
| 16416 | } | 16412 | } |
| @@ -16432,7 +16428,7 @@ procargs(char **argv) | |||
| 16432 | debug = 1; | 16428 | debug = 1; |
| 16433 | #endif | 16429 | #endif |
| 16434 | /* POSIX 1003.2: first arg after "-c CMD" is $0, remainder $1... */ | 16430 | /* POSIX 1003.2: first arg after "-c CMD" is $0, remainder $1... */ |
| 16435 | if (xminusc) { | 16431 | if (minusc) { |
| 16436 | minusc = *xargv++; | 16432 | minusc = *xargv++; |
| 16437 | if (*xargv) | 16433 | if (*xargv) |
| 16438 | goto setarg0; | 16434 | goto setarg0; |
