diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2021-09-28 17:40:59 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2021-09-28 17:40:59 +0200 |
commit | 03ed86b39e887b2f4031961673fddd88fdeb493e (patch) | |
tree | 236ac329fa8afcb26698889b659cfe2fb4a09375 | |
parent | 1be73dd9ad6d2cf6747934374c1d58bd9bc211b4 (diff) | |
download | busybox-w32-03ed86b39e887b2f4031961673fddd88fdeb493e.tar.gz busybox-w32-03ed86b39e887b2f4031961673fddd88fdeb493e.tar.bz2 busybox-w32-03ed86b39e887b2f4031961673fddd88fdeb493e.zip |
libbb: code shrink in main() and scripted_main()
function old new delta
main 68 65 -3
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-3) Total: -3 bytes
text data bss dec hex filename
1472 560 16 2048 800 busybox_old
1398 552 16 1966 7ae busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | libbb/appletlib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 14be33603..5c5d7eb95 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
@@ -726,9 +726,9 @@ int scripted_main(int argc UNUSED_PARAM, char **argv) | |||
726 | int script = find_script_by_name(applet_name); | 726 | int script = find_script_by_name(applet_name); |
727 | if (script >= 0) | 727 | if (script >= 0) |
728 | # if ENABLE_SHELL_ASH | 728 | # if ENABLE_SHELL_ASH |
729 | exit(ash_main(-script - 1, argv)); | 729 | return ash_main(-script - 1, argv); |
730 | # elif ENABLE_SHELL_HUSH | 730 | # elif ENABLE_SHELL_HUSH |
731 | exit(hush_main(-script - 1, argv)); | 731 | return hush_main(-script - 1, argv); |
732 | # else | 732 | # else |
733 | return 1; | 733 | return 1; |
734 | # endif | 734 | # endif |
@@ -1005,10 +1005,10 @@ int scripted_main(int argc UNUSED_PARAM, char **argv) | |||
1005 | { | 1005 | { |
1006 | # if ENABLE_SHELL_ASH | 1006 | # if ENABLE_SHELL_ASH |
1007 | int script = 0; | 1007 | int script = 0; |
1008 | exit(ash_main(-script - 1, argv)); | 1008 | return ash_main(-script - 1, argv); |
1009 | # elif ENABLE_SHELL_HUSH | 1009 | # elif ENABLE_SHELL_HUSH |
1010 | int script = 0; | 1010 | int script = 0; |
1011 | exit(hush_main(-script - 1, argv)); | 1011 | return hush_main(-script - 1, argv); |
1012 | # else | 1012 | # else |
1013 | return 1; | 1013 | return 1; |
1014 | # endif | 1014 | # endif |
@@ -1094,7 +1094,7 @@ int main(int argc UNUSED_PARAM, char **argv) | |||
1094 | 1094 | ||
1095 | full_write2_str(bb_basename(argv[0])); | 1095 | full_write2_str(bb_basename(argv[0])); |
1096 | full_write2_str(": no applets enabled\n"); | 1096 | full_write2_str(": no applets enabled\n"); |
1097 | exit(127); | 1097 | return 127; |
1098 | 1098 | ||
1099 | #else | 1099 | #else |
1100 | 1100 | ||