diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/Kbuild.src | 6 | ||||
| -rw-r--r-- | coreutils/echo.c | 5 | ||||
| -rw-r--r-- | coreutils/printf.c | 5 | ||||
| -rw-r--r-- | coreutils/test.c | 17 |
4 files changed, 16 insertions, 17 deletions
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src index d0b3f62..a805b64 100644 --- a/coreutils/Kbuild.src +++ b/coreutils/Kbuild.src @@ -16,9 +16,3 @@ lib-$(CONFIG_CRONTAB) += cat.o # crontab -l lib-$(CONFIG_ADDUSER) += chown.o # used by adduser lib-$(CONFIG_ADDGROUP) += chown.o # used by addgroup lib-$(CONFIG_FTPD) += ls.o # used by ftpd - -lib-$(CONFIG_ASH_BUILTIN_ECHO) += echo.o -lib-$(CONFIG_HUSH_ECHO) += echo.o - -lib-$(CONFIG_ASH_BUILTIN_PRINTF) += printf.o -lib-$(CONFIG_HUSH_PRINTF) += printf.o diff --git a/coreutils/echo.c b/coreutils/echo.c index d0dba65..a7e4ca9 100644 --- a/coreutils/echo.c +++ b/coreutils/echo.c @@ -28,12 +28,15 @@ //config:config FEATURE_FANCY_ECHO //config: bool "Enable -n and -e options" //config: default y -//config: depends on ECHO || ASH_BUILTIN_ECHO || HUSH_ECHO +//config: depends on ECHO || ASH_ECHO || HUSH_ECHO //applet:IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo)) //kbuild:lib-$(CONFIG_ECHO) += echo.o +//kbuild:lib-$(CONFIG_ASH_ECHO) += echo.o +//kbuild:lib-$(CONFIG_HUSH_ECHO) += echo.o + /* BB_AUDIT SUSv3 compliant -- unless configured as fancy echo. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/echo.html */ diff --git a/coreutils/printf.c b/coreutils/printf.c index 6c8e115..bc22e0e 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c @@ -49,6 +49,9 @@ //kbuild:lib-$(CONFIG_PRINTF) += printf.o +//kbuild:lib-$(CONFIG_ASH_PRINTF) += printf.o +//kbuild:lib-$(CONFIG_HUSH_PRINTF) += printf.o + //usage:#define printf_trivial_usage //usage: "FORMAT [ARG]..." //usage:#define printf_full_usage "\n\n" @@ -417,7 +420,7 @@ int printf_main(int argc UNUSED_PARAM, char **argv) if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2]) argv++; if (!argv[1]) { - if (ENABLE_ASH_BUILTIN_PRINTF + if (ENABLE_ASH_PRINTF && applet_name[0] != 'p' ) { bb_error_msg("usage: printf FORMAT [ARGUMENT...]"); diff --git a/coreutils/test.c b/coreutils/test.c index 288f665..edc625f 100644 --- a/coreutils/test.c +++ b/coreutils/test.c @@ -42,21 +42,20 @@ //config:config FEATURE_TEST_64 //config: bool "Extend test to 64 bit" //config: default y -//config: depends on TEST || TEST1 || TEST2 || ASH_BUILTIN_TEST || HUSH +//config: depends on TEST || TEST1 || TEST2 || ASH_TEST || HUSH_TEST //config: help //config: Enable 64-bit support in test. //applet:IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) -//applet:IF_TEST1(APPLET_NOFORK([, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) -//applet:IF_TEST2(APPLET_NOFORK([[, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) +//applet:IF_TEST1(APPLET_NOFORK([, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) +//applet:IF_TEST2(APPLET_NOFORK([[, test, BB_DIR_USR_BIN, BB_SUID_DROP, test)) -//kbuild:lib-$(CONFIG_TEST) += test.o test_ptr_hack.o +//kbuild:lib-$(CONFIG_TEST) += test.o test_ptr_hack.o //kbuild:lib-$(CONFIG_TEST1) += test.o test_ptr_hack.o //kbuild:lib-$(CONFIG_TEST2) += test.o test_ptr_hack.o -//kbuild:lib-$(CONFIG_ASH_BUILTIN_TEST) += test.o test_ptr_hack.o -//kbuild:lib-$(CONFIG_HUSH) += test.o test_ptr_hack.o -//kbuild:lib-$(CONFIG_SH_IS_HUSH) += test.o test_ptr_hack.o -//kbuild:lib-$(CONFIG_BASH_IS_HUSH) += test.o test_ptr_hack.o + +//kbuild:lib-$(CONFIG_ASH_TEST) += test.o test_ptr_hack.o +//kbuild:lib-$(CONFIG_HUSH_TEST) += test.o test_ptr_hack.o /* "test --help" is special-cased to ignore --help */ //usage:#define test_trivial_usage NOUSAGE_STR @@ -843,7 +842,7 @@ int test_main(int argc, char **argv) const char *arg0; arg0 = bb_basename(argv[0]); - if ((ENABLE_TEST1 || ENABLE_TEST2 || ENABLE_ASH_BUILTIN_TEST || ENABLE_HUSH) + if ((ENABLE_TEST1 || ENABLE_TEST2 || ENABLE_ASH_TEST || ENABLE_HUSH_TEST) && (arg0[0] == '[') ) { --argc; |