summaryrefslogtreecommitdiff
path: root/coreutils/printf.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-12-31 03:36:02 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-12-31 03:36:02 +0000
commit9b8f810d38a720bca94af864e2960de91aae3a29 (patch)
tree10732e1683a0bd01ff263625e1a677b4c0974be2 /coreutils/printf.c
parent9343da45d3f226cc8b45879ac8dbacac2911cdd8 (diff)
downloadbusybox-w32-1_12_4.tar.gz
busybox-w32-1_12_4.tar.bz2
busybox-w32-1_12_4.zip
Apply post 1.12.3 fixes, bump to 1.12.41_12_4
Diffstat (limited to 'coreutils/printf.c')
-rw-r--r--coreutils/printf.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/coreutils/printf.c b/coreutils/printf.c
index 76524f706..b0a48cda4 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -359,8 +359,15 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
359 * We will mimic coreutils. */ 359 * We will mimic coreutils. */
360 if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2]) 360 if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2])
361 argv++; 361 argv++;
362 if (!argv[1]) 362 if (!argv[1]) {
363 if (ENABLE_ASH_BUILTIN_PRINTF
364 && applet_name[0] != 'p'
365 ) {
366 bb_error_msg("usage: printf FORMAT [ARGUMENT...]");
367 return 2; /* bash compat */
368 }
363 bb_show_usage(); 369 bb_show_usage();
370 }
364 371
365 format = argv[1]; 372 format = argv[1];
366 argv2 = argv + 2; 373 argv2 = argv + 2;