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

init: simpler handling of leading dash in commands

Browse Source 
function                                             old     new   delta
init_exec                                            233     219     -14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-12-25 23:58:42 +01:00
parent 8993c3f260
commit 6088e138e1
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
init/init.c
View File

@ -401,20 +401,22 @@ static void init_exec(const char *command)
char buf[COMMAND_SIZE + 6]; /* COMMAND_SIZE+strlen("exec ")+1 */
int dash = (command[0] == '-' /* maybe? && command[1] == '/' */);
command += dash;
/* See if any special /bin/sh requiring characters are present */
if (strpbrk(command, "~`!$^&*()=|\\{}[];\"'<>?") != NULL) {
strcpy(buf, "exec ");
strcpy(buf + 5, command + dash); /* excluding "-" */
sprintf(buf, "exec %s", command); /* excluding "-" */
/* NB: LIBBB_DEFAULT_LOGIN_SHELL define has leading dash */
cmd[0] = (char*)(LIBBB_DEFAULT_LOGIN_SHELL + !dash);
cmd[1] = (char*)"-c";
cmd[2] = buf;
cmd[3] = NULL;
command = LIBBB_DEFAULT_LOGIN_SHELL + 1;
} else {
/* Convert command (char*) into cmd (char**, one word per string) */
char *word, *next;
int i = 0;
next = strcpy(buf, command); /* including "-" */
next = strcpy(buf, command - dash); /* command including "-" */
while ((word = strsep(&next, " \t")) != NULL) {
if (*word != '\0') { /* not two spaces/tabs together? */
cmd[i] = word;
@ -425,14 +427,14 @@ static void init_exec(const char *command)
}
/* If we saw leading "-", it is interactive shell.
* Try harder to give it a controlling tty.
* And skip "-" in actual exec call. */
if (dash) {
*/
if (ENABLE_FEATURE_INIT_SCTTY && dash) {
/* _Attempt_ to make stdin a controlling tty. */
if (ENABLE_FEATURE_INIT_SCTTY)
ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/);
ioctl(STDIN_FILENO, TIOCSCTTY, 0 /*only try, don't steal*/);
}
BB_EXECVP(cmd[0] + dash, cmd);
message(L_LOG | L_CONSOLE, "can't run '%s': %s", cmd[0], strerror(errno));
/* Here command never contains the dash, cmd[0] might */
BB_EXECVP(command, cmd);
message(L_LOG | L_CONSOLE, "can't run '%s': %s", command, strerror(errno));
/* returns if execvp fails */
}

2
shell/ash.c
View File

@ -13063,7 +13063,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
}
}
#endif
if (/* argv[0] && */ argv[0][0] == '-')
if (argv[0] && argv[0][0] == '-')
isloginsh = 1;
if (isloginsh) {
state = 1;