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 /shell/ash.c | |
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 'shell/ash.c')
-rw-r--r-- | shell/ash.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/shell/ash.c b/shell/ash.c index 3651929c2..360d39b4c 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -8417,12 +8417,6 @@ returncmd(int argc ATTRIBUTE_UNUSED, char **argv) | |||
8417 | static int breakcmd(int, char **); | 8417 | static int breakcmd(int, char **); |
8418 | static int dotcmd(int, char **); | 8418 | static int dotcmd(int, char **); |
8419 | static int evalcmd(int, char **); | 8419 | static int evalcmd(int, char **); |
8420 | #if ENABLE_ASH_BUILTIN_ECHO | ||
8421 | static int echocmd(int, char **); | ||
8422 | #endif | ||
8423 | #if ENABLE_ASH_BUILTIN_TEST | ||
8424 | static int testcmd(int, char **); | ||
8425 | #endif | ||
8426 | static int exitcmd(int, char **); | 8420 | static int exitcmd(int, char **); |
8427 | static int exportcmd(int, char **); | 8421 | static int exportcmd(int, char **); |
8428 | #if ENABLE_ASH_GETOPTS | 8422 | #if ENABLE_ASH_GETOPTS |
@@ -8464,6 +8458,9 @@ static int ulimitcmd(int, char **); | |||
8464 | * Apart from the above, [[ expr ]] should work as [ expr ] | 8458 | * Apart from the above, [[ expr ]] should work as [ expr ] |
8465 | */ | 8459 | */ |
8466 | 8460 | ||
8461 | #define testcmd test_main | ||
8462 | #define echocmd echo_main | ||
8463 | |||
8467 | /* Keep these in proper order since it is searched via bsearch() */ | 8464 | /* Keep these in proper order since it is searched via bsearch() */ |
8468 | static const struct builtincmd builtintab[] = { | 8465 | static const struct builtincmd builtintab[] = { |
8469 | { BUILTIN_SPEC_REG ".", dotcmd }, | 8466 | { BUILTIN_SPEC_REG ".", dotcmd }, |
@@ -11506,22 +11503,6 @@ exitcmd(int argc ATTRIBUTE_UNUSED, char **argv) | |||
11506 | /* NOTREACHED */ | 11503 | /* NOTREACHED */ |
11507 | } | 11504 | } |
11508 | 11505 | ||
11509 | #if ENABLE_ASH_BUILTIN_ECHO | ||
11510 | static int | ||
11511 | echocmd(int argc, char **argv) | ||
11512 | { | ||
11513 | return echo_main(argc, argv); | ||
11514 | } | ||
11515 | #endif | ||
11516 | |||
11517 | #if ENABLE_ASH_BUILTIN_TEST | ||
11518 | static int | ||
11519 | testcmd(int argc, char **argv) | ||
11520 | { | ||
11521 | return test_main(argc, argv); | ||
11522 | } | ||
11523 | #endif | ||
11524 | |||
11525 | /* | 11506 | /* |
11526 | * Read a file containing shell functions. | 11507 | * Read a file containing shell functions. |
11527 | */ | 11508 | */ |