aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-11 17:03:19 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-11 17:03:19 +0000
commit9a5db51b503eba9c9b58ceabbf03869930429565 (patch)
treefe03aa276fa5396402dc2bc88fccb7559626b976 /shell
parent9e02dd5233d637966f7b94d666033b8109cbd155 (diff)
downloadbusybox-w32-9a5db51b503eba9c9b58ceabbf03869930429565.tar.gz
busybox-w32-9a5db51b503eba9c9b58ceabbf03869930429565.tar.bz2
busybox-w32-9a5db51b503eba9c9b58ceabbf03869930429565.zip
rename: run_applet_by_name -> run_applet_and_exit
git-svn-id: svn://busybox.net/trunk/busybox@18402 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell')
-rw-r--r--shell/bbsh.c2
-rw-r--r--shell/hush.c2
-rw-r--r--shell/lash.c2
-rw-r--r--shell/msh.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/shell/bbsh.c b/shell/bbsh.c
index 06fd0131e..6bef3685a 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -165,7 +165,7 @@ static int run_pipeline(struct pipeline *line)
165 int status; 165 int status;
166 pid_t pid=fork(); 166 pid_t pid=fork();
167 if(!pid) { 167 if(!pid) {
168 run_applet_by_name(cmd->argv[0],cmd->argc,cmd->argv); 168 run_applet_and_exit(cmd->argv[0],cmd->argc,cmd->argv);
169 execvp(cmd->argv[0],cmd->argv); 169 execvp(cmd->argv[0],cmd->argv);
170 printf("No %s",cmd->argv[0]); 170 printf("No %s",cmd->argv[0]);
171 exit(1); 171 exit(1);
diff --git a/shell/hush.c b/shell/hush.c
index f6c69a221..3048d695a 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1123,7 +1123,7 @@ static void pseudo_exec(struct child_prog *child)
1123 /**/; 1123 /**/;
1124 optind = 1; 1124 optind = 1;
1125 debug_printf("running applet %s\n", name); 1125 debug_printf("running applet %s\n", name);
1126 run_applet_by_name(name, argc_l, child->argv); 1126 run_applet_and_exit(name, argc_l, child->argv);
1127 } 1127 }
1128#endif 1128#endif
1129 debug_printf("exec of %s\n", child->argv[0]); 1129 debug_printf("exec of %s\n", child->argv[0]);
diff --git a/shell/lash.c b/shell/lash.c
index 99e2b1f06..f91bec254 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1170,7 +1170,7 @@ static int pseudo_exec(struct child_prog *child)
1170 1170
1171 for (argc_l = 0; *argv_l; argv_l++, argc_l++); 1171 for (argc_l = 0; *argv_l; argv_l++, argc_l++);
1172 optind = 1; 1172 optind = 1;
1173 run_applet_by_name(child->argv[0], argc_l, child->argv); 1173 run_applet_and_exit(child->argv[0], argc_l, child->argv);
1174 } 1174 }
1175 1175
1176 execvp(child->argv[0], child->argv); 1176 execvp(child->argv[0], child->argv);
diff --git a/shell/msh.c b/shell/msh.c
index 0337a4f06..963e59446 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -3068,7 +3068,7 @@ static const char *rexecve(char *c, char **v, char **envp)
3068 optind = 1; 3068 optind = 1;
3069 if (find_applet_by_name(name)) { 3069 if (find_applet_by_name(name)) {
3070 /* We have to exec here since we vforked. Running 3070 /* We have to exec here since we vforked. Running
3071 * run_applet_by_name() won't work and bad things 3071 * run_applet_and_exit() won't work and bad things
3072 * will happen. */ 3072 * will happen. */
3073 execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp); 3073 execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
3074 } 3074 }