diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-30 08:04:05 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-30 08:04:05 +0000 |
commit | dc757aa16ce53d9784fa3953b0c3762dfa8ccda9 (patch) | |
tree | 2eee7a83dcbd38fcfbcdbec8b5d52f4baff3326f /applets | |
parent | f7d07b1723c15ee818f0c1f5cce96c55274024a6 (diff) | |
download | busybox-w32-dc757aa16ce53d9784fa3953b0c3762dfa8ccda9.tar.gz busybox-w32-dc757aa16ce53d9784fa3953b0c3762dfa8ccda9.tar.bz2 busybox-w32-dc757aa16ce53d9784fa3953b0c3762dfa8ccda9.zip |
introduce and use bb_basename()
function old new delta
bb_basename - 26 +26
sv_main 1226 1225 -1
passwd_main 1985 1983 -2
showdirs 482 478 -4
sendCgi 1811 1807 -4
make_device 1354 1350 -4
handleIncoming 2443 2439 -4
func_name 82 78 -4
service_name 2292 2285 -7
main 909 901 -8
cmp_main 555 547 -8
test_main 434 422 -12
act 228 216 -12
find_pair 180 164 -16
rmmod_main 298 280 -18
find_pid_by_name 156 134 -22
modprobe_main 1606 1576 -30
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/16 up/down: 26/-156) Total: -130 bytes
text data bss dec hex filename
734933 3028 14400 752361 b7ae9 busybox_old
734801 3028 14400 752229 b7a65 busybox_unstripped
Diffstat (limited to 'applets')
-rw-r--r-- | applets/applets.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/applets/applets.c b/applets/applets.c index 57c972f79..89dea3e6a 100644 --- a/applets/applets.c +++ b/applets/applets.c | |||
@@ -639,8 +639,6 @@ int *const bb_errno __attribute__ ((section (".data"))); | |||
639 | 639 | ||
640 | int main(int argc, char **argv) | 640 | int main(int argc, char **argv) |
641 | { | 641 | { |
642 | const char *s; | ||
643 | |||
644 | #ifdef __GLIBC__ | 642 | #ifdef __GLIBC__ |
645 | (*(int **)&bb_errno) = __errno_location(); | 643 | (*(int **)&bb_errno) = __errno_location(); |
646 | #endif | 644 | #endif |
@@ -655,9 +653,7 @@ int main(int argc, char **argv) | |||
655 | applet_name = argv[0]; | 653 | applet_name = argv[0]; |
656 | if (applet_name[0] == '-') | 654 | if (applet_name[0] == '-') |
657 | applet_name++; | 655 | applet_name++; |
658 | s = strrchr(applet_name, '/'); | 656 | applet_name = bb_basename(applet_name); |
659 | if (s) | ||
660 | applet_name = s + 1; | ||
661 | 657 | ||
662 | parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */ | 658 | parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */ |
663 | 659 | ||