diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-10 15:13:30 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-10 15:13:30 +0100 |
| commit | 265062d59dd46065ad34519f04615fb2cecefe8a (patch) | |
| tree | 6f5d8a3f87a9718b06dca325554410a3337f5b0f /coreutils/printf.c | |
| parent | f560422fa079b07a761a572ca4f9cf287c2cc47e (diff) | |
| download | busybox-w32-265062d59dd46065ad34519f04615fb2cecefe8a.tar.gz busybox-w32-265062d59dd46065ad34519f04615fb2cecefe8a.tar.bz2 busybox-w32-265062d59dd46065ad34519f04615fb2cecefe8a.zip | |
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 6c8e115d8..bc22e0ee7 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c | |||
| @@ -49,6 +49,9 @@ | |||
| 49 | 49 | ||
| 50 | //kbuild:lib-$(CONFIG_PRINTF) += printf.o | 50 | //kbuild:lib-$(CONFIG_PRINTF) += printf.o |
| 51 | 51 | ||
| 52 | //kbuild:lib-$(CONFIG_ASH_PRINTF) += printf.o | ||
| 53 | //kbuild:lib-$(CONFIG_HUSH_PRINTF) += printf.o | ||
| 54 | |||
| 52 | //usage:#define printf_trivial_usage | 55 | //usage:#define printf_trivial_usage |
| 53 | //usage: "FORMAT [ARG]..." | 56 | //usage: "FORMAT [ARG]..." |
| 54 | //usage:#define printf_full_usage "\n\n" | 57 | //usage:#define printf_full_usage "\n\n" |
| @@ -417,7 +420,7 @@ int printf_main(int argc UNUSED_PARAM, char **argv) | |||
| 417 | if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2]) | 420 | if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2]) |
| 418 | argv++; | 421 | argv++; |
| 419 | if (!argv[1]) { | 422 | if (!argv[1]) { |
| 420 | if (ENABLE_ASH_BUILTIN_PRINTF | 423 | if (ENABLE_ASH_PRINTF |
| 421 | && applet_name[0] != 'p' | 424 | && applet_name[0] != 'p' |
| 422 | ) { | 425 | ) { |
| 423 | bb_error_msg("usage: printf FORMAT [ARGUMENT...]"); | 426 | bb_error_msg("usage: printf FORMAT [ARGUMENT...]"); |
