aboutsummaryrefslogtreecommitdiff
path: root/coreutils/printf.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2017-02-08 20:09:29 +0000
committerRon Yorston <rmy@pobox.com>2017-02-08 20:09:29 +0000
commit373275a708bafb88fa4f0519de2166154f44fed9 (patch)
tree4587b4fd3f695e0f3705b2a217e199f3144df931 /coreutils/printf.c
parentb74b2619779b1deb903b7766261807df1e9b1f7f (diff)
parentc2b18583a3df06aeecf535c3cea6856aa1f2e205 (diff)
downloadbusybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.tar.gz
busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.tar.bz2
busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/printf.c')
-rw-r--r--coreutils/printf.c5
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...]");