diff options
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/printf.c | 10 | ||||
-rw-r--r-- | coreutils/sleep.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/printf.c b/coreutils/printf.c index 7763d7c46..4edcfa9b5 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c | |||
@@ -425,9 +425,9 @@ int printf_main(int argc UNUSED_PARAM, char **argv) | |||
425 | /* bash builtin errors out on "printf '-%s-\n' foo", | 425 | /* bash builtin errors out on "printf '-%s-\n' foo", |
426 | * coreutils-6.9 works. Both work with "printf -- '-%s-\n' foo". | 426 | * coreutils-6.9 works. Both work with "printf -- '-%s-\n' foo". |
427 | * We will mimic coreutils. */ | 427 | * We will mimic coreutils. */ |
428 | if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2]) | 428 | argv = skip_dash_dash(argv); |
429 | argv++; | 429 | |
430 | if (!argv[1]) { | 430 | if (!argv[0]) { |
431 | if ((ENABLE_ASH_PRINTF || ENABLE_HUSH_PRINTF) | 431 | if ((ENABLE_ASH_PRINTF || ENABLE_HUSH_PRINTF) |
432 | && applet_name[0] != 'p' | 432 | && applet_name[0] != 'p' |
433 | ) { | 433 | ) { |
@@ -437,8 +437,8 @@ int printf_main(int argc UNUSED_PARAM, char **argv) | |||
437 | bb_show_usage(); | 437 | bb_show_usage(); |
438 | } | 438 | } |
439 | 439 | ||
440 | format = argv[1]; | 440 | format = argv[0]; |
441 | argv2 = argv + 2; | 441 | argv2 = argv + 1; |
442 | 442 | ||
443 | conv_err = 0; | 443 | conv_err = 0; |
444 | do { | 444 | do { |
diff --git a/coreutils/sleep.c b/coreutils/sleep.c index 6edff59cc..fa74f1fd4 100644 --- a/coreutils/sleep.c +++ b/coreutils/sleep.c | |||
@@ -71,8 +71,8 @@ int sleep_main(int argc UNUSED_PARAM, char **argv) | |||
71 | * + we can't use bb_show_usage | 71 | * + we can't use bb_show_usage |
72 | * + applet_name can be the name of the shell | 72 | * + applet_name can be the name of the shell |
73 | */ | 73 | */ |
74 | ++argv; | 74 | argv = skip_dash_dash(argv); |
75 | if (!*argv) { | 75 | if (!argv[0]) { |
76 | /* Without this, bare "sleep" in ash shows _ash_ --help */ | 76 | /* Without this, bare "sleep" in ash shows _ash_ --help */ |
77 | /* (ash can be the "sh" applet as well, so check 2nd char) */ | 77 | /* (ash can be the "sh" applet as well, so check 2nd char) */ |
78 | if (ENABLE_ASH_SLEEP && applet_name[1] != 'l') { | 78 | if (ENABLE_ASH_SLEEP && applet_name[1] != 'l') { |