diff options
Diffstat (limited to 'libbb/run_shell.c')
-rw-r--r-- | libbb/run_shell.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libbb/run_shell.c b/libbb/run_shell.c index 4608a24a9..4d92c3caa 100644 --- a/libbb/run_shell.c +++ b/libbb/run_shell.c | |||
@@ -49,15 +49,14 @@ void FAST_FUNC set_current_security_context(security_context_t sid) | |||
49 | 49 | ||
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. | 52 | /* Run SHELL, or DEFAULT_SHELL if SHELL is "" or NULL. |
53 | If COMMAND is nonzero, pass it to the shell with the -c option. | 53 | * If COMMAND is nonzero, pass it to the shell with the -c option. |
54 | If ADDITIONAL_ARGS is nonzero, pass it to the shell as more | 54 | * If ADDITIONAL_ARGS is nonzero, pass it to the shell as more |
55 | arguments. */ | 55 | * arguments. */ |
56 | |||
57 | void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) | 56 | void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) |
58 | { | 57 | { |
59 | const char **args; | 58 | const char **args; |
60 | int argno = 1; | 59 | int argno; |
61 | int additional_args_cnt = 0; | 60 | int additional_args_cnt = 0; |
62 | 61 | ||
63 | for (args = additional_args; args && *args; args++) | 62 | for (args = additional_args; args && *args; args++) |
@@ -65,11 +64,13 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command, | |||
65 | 64 | ||
66 | args = xmalloc(sizeof(char*) * (4 + additional_args_cnt)); | 65 | args = xmalloc(sizeof(char*) * (4 + additional_args_cnt)); |
67 | 66 | ||
68 | args[0] = bb_get_last_path_component_nostrip(xstrdup(shell)); | 67 | if (!shell || !shell[0]) |
68 | shell = DEFAULT_SHELL; | ||
69 | 69 | ||
70 | args[0] = bb_get_last_path_component_nostrip(shell); | ||
70 | if (loginshell) | 71 | if (loginshell) |
71 | args[0] = xasprintf("-%s", args[0]); | 72 | args[0] = xasprintf("-%s", args[0]); |
72 | 73 | argno = 1; | |
73 | if (command) { | 74 | if (command) { |
74 | args[argno++] = "-c"; | 75 | args[argno++] = "-c"; |
75 | args[argno++] = command; | 76 | args[argno++] = command; |
@@ -79,6 +80,7 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command, | |||
79 | args[argno++] = *additional_args; | 80 | args[argno++] = *additional_args; |
80 | } | 81 | } |
81 | args[argno] = NULL; | 82 | args[argno] = NULL; |
83 | |||
82 | #if ENABLE_SELINUX | 84 | #if ENABLE_SELINUX |
83 | if (current_sid) | 85 | if (current_sid) |
84 | setexeccon(current_sid); | 86 | setexeccon(current_sid); |