aboutsummaryrefslogtreecommitdiff
path: root/findutils/find.c
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-09 13:04:50 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-09 13:04:50 +0000
commit68a4a5b8a86e3c0f0f371e6d3ad04cb513f10d19 (patch)
tree9aa16703d48b9a7a38ccaec3759a19e95e976383 /findutils/find.c
parent4565afa16cb2dd94d5aac41b6627e0a5240fbbe0 (diff)
downloadbusybox-w32-68a4a5b8a86e3c0f0f371e6d3ad04cb513f10d19.tar.gz
busybox-w32-68a4a5b8a86e3c0f0f371e6d3ad04cb513f10d19.tar.bz2
busybox-w32-68a4a5b8a86e3c0f0f371e6d3ad04cb513f10d19.zip
Implement first instance of NOFORK applet - echo
find: use NOFORK/NOEXEC; small -exec buglet also eliminated vfork_daemon_rexec: honor PREFER_APPLETS echo: small size improvements find -exec echo {} \; with PREFER_APPLETS=y runs 4 times faster git-svn-id: svn://busybox.net/trunk/busybox@18372 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'findutils/find.c')
-rw-r--r--findutils/find.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/findutils/find.c b/findutils/find.c
index 594eafca4..7b5a09d56 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -242,9 +242,30 @@ ACTF(exec)
242 for (i = 0; i < ap->exec_argc; i++) 242 for (i = 0; i < ap->exec_argc; i++)
243 argv[i] = subst(ap->exec_argv[i], ap->subst_count[i], fileName); 243 argv[i] = subst(ap->exec_argv[i], ap->subst_count[i], fileName);
244 argv[i] = NULL; /* terminate the list */ 244 argv[i] = NULL; /* terminate the list */
245 rc = wait4pid(spawn(argv)); 245
246 if (rc) 246 if (ENABLE_FEATURE_EXEC_PREFER_APPLETS) {
247 const struct BB_applet *a = find_applet_by_name(argv[0]);
248 if (a) {
249 if (a->nofork) {
250 rc = a->main(ap->exec_argc, argv);
251 goto f;
252 }
253#ifndef BB_NOMMU
254 if (a->noexec) {
255 rc = fork();
256 if (rc) goto w;
257 current_applet = a;
258 run_current_applet_and_exit(ap->exec_argc, argv);
259 }
260#endif
261 }
262 }
263 rc = spawn(argv);
264 w:
265 rc = wait4pid(rc);
266 if (rc < 0)
247 bb_perror_msg("%s", argv[0]); 267 bb_perror_msg("%s", argv[0]);
268 f:
248 for (i = 0; i < ap->exec_argc; i++) 269 for (i = 0; i < ap->exec_argc; i++)
249 free(argv[i]); 270 free(argv[i]);
250 return rc == 0; /* return 1 if success */ 271 return rc == 0; /* return 1 if success */