diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-01 14:47:57 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-01 14:47:57 +0000 |
commit | 468aea2d8800cc0496383616d82d7c957ae8bc50 (patch) | |
tree | 8a2f3d80dc2440dd007caed4cfa235b3858c9170 /include | |
parent | 165f5b394fa337e71e08435b51108f4394199b2b (diff) | |
download | busybox-w32-468aea2d8800cc0496383616d82d7c957ae8bc50.tar.gz busybox-w32-468aea2d8800cc0496383616d82d7c957ae8bc50.tar.bz2 busybox-w32-468aea2d8800cc0496383616d82d7c957ae8bc50.zip |
shells: do not frocibly enable test, echo and kill _applets_,
just build relevant source and use xxx_main functions.
build system: add a special case when we have exactly one applet enabled
(makes "true", "false", "basename" REALLY tiny).
getopt32: do not use stdio.
function old new delta
getopt32 1385 1412 +27
make_device 1187 1200 +13
basename_main 120 127 +7
tcpudpsvd_main 1922 1926 +4
testcmd 5 - -5
echocmd 5 - -5
fuser_main 1243 1231 -12
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 4/1 up/down: 51/-22) Total: 29 bytes
Diffstat (limited to 'include')
-rw-r--r-- | include/busybox.h | 3 | ||||
-rw-r--r-- | include/libbb.h | 17 |
2 files changed, 7 insertions, 13 deletions
diff --git a/include/busybox.h b/include/busybox.h index cad45ac00..0c44d2f51 100644 --- a/include/busybox.h +++ b/include/busybox.h | |||
@@ -59,9 +59,6 @@ extern const uint8_t applet_install_loc[]; | |||
59 | /* Length of these names has effect on size of libbusybox | 59 | /* Length of these names has effect on size of libbusybox |
60 | * and "individual" binaries. Keep them short. | 60 | * and "individual" binaries. Keep them short. |
61 | */ | 61 | */ |
62 | void lbb_prepare(const char *applet | ||
63 | USE_FEATURE_INDIVIDUAL(, char **argv) | ||
64 | ) MAIN_EXTERNALLY_VISIBLE; | ||
65 | #if ENABLE_BUILD_LIBBUSYBOX | 62 | #if ENABLE_BUILD_LIBBUSYBOX |
66 | #if ENABLE_FEATURE_SHARED_BUSYBOX | 63 | #if ENABLE_FEATURE_SHARED_BUSYBOX |
67 | int lbb_main(char **argv) EXTERNALLY_VISIBLE; | 64 | int lbb_main(char **argv) EXTERNALLY_VISIBLE; |
diff --git a/include/libbb.h b/include/libbb.h index edf27c6d5..202574adb 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -848,23 +848,20 @@ extern void bb_verror_msg(const char *s, va_list p, const char *strerr); | |||
848 | 848 | ||
849 | /* applets which are useful from another applets */ | 849 | /* applets which are useful from another applets */ |
850 | int bb_cat(char** argv); | 850 | int bb_cat(char** argv); |
851 | int echo_main(int argc, char** argv) MAIN_EXTERNALLY_VISIBLE; | 851 | /* If shell needs them, these three "exist" even if not enabled as applets */ |
852 | int test_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 852 | int echo_main(int argc, char** argv) USE_ECHO(MAIN_EXTERNALLY_VISIBLE); |
853 | int kill_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 853 | int test_main(int argc, char **argv) USE_TEST(MAIN_EXTERNALLY_VISIBLE); |
854 | #if ENABLE_ROUTE | 854 | int kill_main(int argc, char **argv) USE_KILL(MAIN_EXTERNALLY_VISIBLE); |
855 | void bb_displayroutes(int noresolve, int netstatfmt); | ||
856 | #endif | ||
857 | int chown_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 855 | int chown_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
858 | #if ENABLE_GUNZIP | ||
859 | int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 856 | int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
860 | #endif | ||
861 | #if ENABLE_BUNZIP2 | ||
862 | int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 857 | int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
863 | #endif | ||
864 | int bbunpack(char **argv, | 858 | int bbunpack(char **argv, |
865 | char* (*make_new_name)(char *filename), | 859 | char* (*make_new_name)(char *filename), |
866 | USE_DESKTOP(long long) int (*unpacker)(void) | 860 | USE_DESKTOP(long long) int (*unpacker)(void) |
867 | ); | 861 | ); |
862 | #if ENABLE_ROUTE | ||
863 | void bb_displayroutes(int noresolve, int netstatfmt); | ||
864 | #endif | ||
868 | 865 | ||
869 | 866 | ||
870 | /* Networking */ | 867 | /* Networking */ |