diff options
| author | Denys Vlasenko | 2017-01-10 15:13:30 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2017-01-10 15:13:30 +0100 |
| commit | 265062d59dd46065ad34519f04615fb2cecefe8a (patch) | |
| tree | 6f5d8a3f87a9718b06dca325554410a3337f5b0f /coreutils/printf.c | |
| parent | f560422fa079b07a761a572ca4f9cf287c2cc47e (diff) | |
| download | busybox-265062d59dd46065ad34519f04615fb2cecefe8a.zip busybox-265062d59dd46065ad34519f04615fb2cecefe8a.tar.gz | |
shells: make hush test optional, rename ASH_BUILTIN_foo -> ASH_foo
This makes hash and ash more symmetrical wrt config menu and config
options.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/printf.c')
| -rw-r--r-- | coreutils/printf.c | 5 |
1 files changed, 4 insertions, 1 deletions
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...]"); |