diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-24 18:27:04 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-24 18:27:04 +0000 |
| commit | 818322b9b19a452d66a07ca69256e2c092f5db5f (patch) | |
| tree | 0b34390ac0cd61951bb9dc5b9fd3a226dae4f1ef /init | |
| parent | a7ce207bd82882d6436d256a73c42ca4c8500ff3 (diff) | |
| download | busybox-w32-818322b9b19a452d66a07ca69256e2c092f5db5f.tar.gz busybox-w32-818322b9b19a452d66a07ca69256e2c092f5db5f.tar.bz2 busybox-w32-818322b9b19a452d66a07ca69256e2c092f5db5f.zip | |
*: 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.c | 5 |
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) | |||
| 436 | ++cmdpath; | 436 | ++cmdpath; |
| 437 | 437 | ||
| 438 | /* find the last component in the command pathname */ | 438 | /* find the last component in the command pathname */ |
| 439 | s = bb_get_last_path_component(cmdpath); | 439 | s = bb_get_last_path_component_nostrip(cmdpath); |
| 440 | 440 | ||
| 441 | /* make a new argv[0] */ | 441 | /* make a new argv[0] */ |
| 442 | if ((cmd[0] = malloc(strlen(s) + 2)) == NULL) { | 442 | cmd[0] = malloc(strlen(s) + 2); |
| 443 | if (cmd[0] == NULL) { | ||
| 443 | message(L_LOG | L_CONSOLE, bb_msg_memory_exhausted); | 444 | message(L_LOG | L_CONSOLE, bb_msg_memory_exhausted); |
| 444 | cmd[0] = cmdpath; | 445 | cmd[0] = cmdpath; |
| 445 | } else { | 446 | } else { |