rename: run_applet_by_name -> run_applet_and_exit
This commit is contained in:
+1
-1
@@ -165,7 +165,7 @@ static int run_pipeline(struct pipeline *line)
|
||||
int status;
|
||||
pid_t pid=fork();
|
||||
if(!pid) {
|
||||
run_applet_by_name(cmd->argv[0],cmd->argc,cmd->argv);
|
||||
run_applet_and_exit(cmd->argv[0],cmd->argc,cmd->argv);
|
||||
execvp(cmd->argv[0],cmd->argv);
|
||||
printf("No %s",cmd->argv[0]);
|
||||
exit(1);
|
||||
|
||||
+1
-1
@@ -1123,7 +1123,7 @@ static void pseudo_exec(struct child_prog *child)
|
||||
/**/;
|
||||
optind = 1;
|
||||
debug_printf("running applet %s\n", name);
|
||||
run_applet_by_name(name, argc_l, child->argv);
|
||||
run_applet_and_exit(name, argc_l, child->argv);
|
||||
}
|
||||
#endif
|
||||
debug_printf("exec of %s\n", child->argv[0]);
|
||||
|
||||
+1
-1
@@ -1170,7 +1170,7 @@ static int pseudo_exec(struct child_prog *child)
|
||||
|
||||
for (argc_l = 0; *argv_l; argv_l++, argc_l++);
|
||||
optind = 1;
|
||||
run_applet_by_name(child->argv[0], argc_l, child->argv);
|
||||
run_applet_and_exit(child->argv[0], argc_l, child->argv);
|
||||
}
|
||||
|
||||
execvp(child->argv[0], child->argv);
|
||||
|
||||
+1
-1
@@ -3068,7 +3068,7 @@ static const char *rexecve(char *c, char **v, char **envp)
|
||||
optind = 1;
|
||||
if (find_applet_by_name(name)) {
|
||||
/* We have to exec here since we vforked. Running
|
||||
* run_applet_by_name() won't work and bad things
|
||||
* run_applet_and_exit() won't work and bad things
|
||||
* will happen. */
|
||||
execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user