emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

su: expand help; simplify passing of -c CMD to run_shell()

Browse Source 
Also, added a comment about bug 9401 (TIOCSTI input injection).

function                                             old     new   delta
packed_usage                                       30909   30932     +23
su_main                                              470     487     +17
sulogin_main                                         260     258      -2
run_applet_and_exit                                  681     678      -3
run_shell                                            166     126     -40

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2016-11-03 22:13:08 +01:00
parent 2b288236e8
commit 79e2598c48
6 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libbb/run_shell.c
View File

@ -50,19 +50,17 @@ void FAST_FUNC set_current_security_context(security_context_t sid)
#endif
/* Run SHELL, or DEFAULT_SHELL if SHELL is "" or NULL.
* If COMMAND is nonzero, pass it to the shell with the -c option.
* If ADDITIONAL_ARGS is nonzero, pass it to the shell as more
* arguments. */
void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command, const char **additional_args)
* If ADDITIONAL_ARGS is not NULL, pass them to the shell.
*/
void FAST_FUNC run_shell(const char *shell, int loginshell, const char **additional_args)
{
const char **args;
int argno;
int additional_args_cnt = 0;
for (args = additional_args; args && *args; args++)
additional_args_cnt++;
args = additional_args;
while (args && *args)
args++;
args = xmalloc(sizeof(char*) * (4 + additional_args_cnt));
args = xmalloc(sizeof(char*) * (2 + (args - additional_args)));
if (!shell || !shell[0])
shell = DEFAULT_SHELL;
@ -70,16 +68,13 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command,
args[0] = bb_get_last_path_component_nostrip(shell);
if (loginshell)
args[0] = xasprintf("-%s", args[0]);
argno = 1;
if (command) {
args[argno++] = "-c";
args[argno++] = command;
}
args[1] = NULL;
if (additional_args) {
for (; *additional_args; ++additional_args)
args[argno++] = *additional_args;
int cnt = 1;
for (;;)
if ((args[cnt++] = *additional_args++) == NULL)
break;
}
args[argno] = NULL;
#if ENABLE_SELINUX
if (current_sid)