Changes in uspace/app/bdsh/cmds/modules/sleep/sleep.c [b49d872:36ab7c7] in mainline

File:

• uspace/app/bdsh/cmds/modules/sleep/sleep.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/sleep/sleep.c

@@ -27 +27 @@
  */
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include "config.h"
 #include "util.h"
@@ -43 +41 @@
 void help_cmd_sleep(unsigned int level)
 {
-        if (level == HELP_SHORT) {
-                printf("`%s' pauses for a given time interval\n", cmdname);
-        } else {
-                help_cmd_sleep(HELP_SHORT);
-                printf(
-                    "Usage:  %s <duration>\n"
-                    "The duration is a decimal number of seconds.\n",
-                    cmdname);
-        }
-
+        printf("This is the %s help for '%s'.\n",
+                level ? EXT_HELP : SHORT_HELP, cmdname);
         return;
-}
-
-/** Convert string containing decimal seconds to useconds_t.
- *
- * @param nptr   Pointer to string.
- * @param result Result of the conversion.
- * @return EOK if conversion was successful.
- */
-static int decimal_to_useconds(const char *nptr, useconds_t *result)
-{
-        int ret;
-        uint64_t whole_seconds;
-        uint64_t frac_seconds;
-        const char *endptr;
-
-        /* Check for whole seconds */
-        if (*nptr == '.') {
-                whole_seconds = 0;
-                endptr = (char *)nptr;
-        } else {
-                ret = str_uint64_t(nptr, &endptr, 10, false, &whole_seconds);
-                if (ret != EOK)
-                        return ret;
-        }
-
-        /* Check for fractional seconds */
-        if (*endptr == '\0') {
-                frac_seconds = 0;
-        } else if (*endptr == '.' && endptr[1] == '\0') {
-                frac_seconds = 0;
-        } else if (*endptr == '.') {
-                nptr = endptr + 1;
-                ret = str_uint64_t(nptr, &endptr, 10, true, &frac_seconds);
-                if (ret != EOK)
-                        return ret;
-
-                int ndigits = endptr - nptr;
-                for (; ndigits < 6; ndigits++) 
-                        frac_seconds *= 10;
-                for (; ndigits > 6; ndigits--)
-                        frac_seconds /= 10;
-        } else {
-                return EINVAL;
-        }
-
-        /* Check for overflow */
-        useconds_t total = whole_seconds * 1000000 + frac_seconds;
-        if (total / 1000000 != whole_seconds)
-                return EOVERFLOW;
-
-        *result = total;
-
-        return EOK;
 }
 
@@ -112 +49 @@
 int cmd_sleep(char **argv)
 {
-        int ret;
         unsigned int argc;
-        useconds_t duration = 0;
+        unsigned int i;
 
         /* Count the arguments */
-        argc = cli_count_args(argv);
+        for (argc = 0; argv[argc] != NULL; argc ++);
 
-        if (argc != 2) {
-                printf("%s - incorrect number of arguments. Try `help %s'\n",
-                    cmdname, cmdname);
-                return CMD_FAILURE;
+        printf("%s %s\n", TEST_ANNOUNCE, cmdname);
+        printf("%d arguments passed to %s", argc - 1, cmdname);
+
+        if (argc < 2) {
+                printf("\n");
+                return CMD_SUCCESS;
         }
 
-        ret = decimal_to_useconds(argv[1], &duration);
-        if (ret != EOK) {
-                printf("%s - invalid duration.\n", cmdname);
-                return CMD_FAILURE;
-        }
-
-        (void) usleep(duration);
+        printf(":\n");
+        for (i = 1; i < argc; i++)
+                printf("[%d] -> %s\n", i, argv[i]);
 
         return CMD_SUCCESS;