2 files changed, 15 insertions, 2 deletions

diff --git a/coreutils/printf.c b/coreutils/printf.c
index da129f909..411edd5b9 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -493,7 +493,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_PRINTF
+                if ((ENABLE_ASH_PRINTF || ENABLE_HUSH_PRINTF)
                  && applet_name[0] != 'p'
                 ) {
                         bb_simple_error_msg("usage: printf FORMAT [ARGUMENT...]");
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 442841210..667db558d 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -65,15 +65,28 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
 {
         duration_t duration;
 
+        /* Note: sleep_main may be directly called from ash as a builtin.
+         * This brings some complications:
+         * + we can't use xfunc here
+         * + we can't use bb_show_usage
+         * + applet_name can be the name of the shell
+         */
         ++argv;
-        if (!*argv)
+        if (!*argv) {
+                /* Without this, bare "sleep" in ash shows _ash_ --help */
+                if (ENABLE_ASH_SLEEP && applet_name[0] != 's') {
+                        bb_simple_error_msg("sleep: missing operand");
+                        return EXIT_FAILURE;
+                }
                 bb_show_usage();
+        }
 
         /* GNU sleep accepts "inf", "INF", "infinity" and "INFINITY" */
         if (strncasecmp(argv[0], "inf", 3) == 0)
                 for (;;)
                         sleep(INT_MAX);
 
+//FIXME: in ash, "sleep 123qwerty" as a builtin aborts the shell
 #if ENABLE_FEATURE_FANCY_SLEEP
         duration = 0;
         do {