aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-09-24 18:27:04 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-09-24 18:27:04 +0000
commit818322b9b19a452d66a07ca69256e2c092f5db5f (patch)
tree0b34390ac0cd61951bb9dc5b9fd3a226dae4f1ef /init
parenta7ce207bd82882d6436d256a73c42ca4c8500ff3 (diff)
downloadbusybox-818322b9b19a452d66a07ca69256e2c092f5db5f.tar.gz
busybox-818322b9b19a452d66a07ca69256e2c092f5db5f.tar.bz2
*: kill bb_get_last_path_component, replace with two functions
(one which strips trailing slash and one which does not) wget: straighten out as a result of above change text data bss dec hex filename 5056 1 0 5057 13c1 busybox.t4/networking/wget.o 5022 0 0 5022 139e busybox.t5/networking/wget.o
Diffstat (limited to 'init')
-rw-r--r--init/init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/init/init.c b/init/init.c
index a196ab3ed..543ec2ea8 100644
--- a/init/init.c
+++ b/init/init.c
@@ -436,10 +436,11 @@ static pid_t run(const struct init_action *a)
++cmdpath;
/* find the last component in the command pathname */
- s = bb_get_last_path_component(cmdpath);
+ s = bb_get_last_path_component_nostrip(cmdpath);
/* make a new argv[0] */
- if ((cmd[0] = malloc(strlen(s) + 2)) == NULL) {
+ cmd[0] = malloc(strlen(s) + 2);
+ if (cmd[0] == NULL) {
message(L_LOG | L_CONSOLE, bb_msg_memory_exhausted);
cmd[0] = cmdpath;
} else {