Changeset 1dbe465 in mainline for uspace/app/bdsh/cmds/modules/sleep/sleep.c

Timestamp:

2012-04-08T09:22:47Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

81475250

Parents:

e367f5b8 (diff), 081d60f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge bdsh/sleep (thx Sean Bartell)

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"
@@ -41 +43 @@
 void help_cmd_sleep(unsigned int level)
 {
-        printf("This is the %s help for '%s'.\n",
-                level ? EXT_HELP : SHORT_HELP, cmdname);
+        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);
+        }
+
         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;
+        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;
 }
 
@@ -49 +112 @@
 int cmd_sleep(char **argv)
 {
+        int ret;
         unsigned int argc;
-        unsigned int i;
+        useconds_t duration;
 
         /* Count the arguments */
-        for (argc = 0; argv[argc] != NULL; argc ++);
+        argc = cli_count_args(argv);
 
-        printf("%s %s\n", TEST_ANNOUNCE, cmdname);
-        printf("%d arguments passed to %s", argc - 1, cmdname);
-
-        if (argc < 2) {
-                printf("\n");
-                return CMD_SUCCESS;
+        if (argc != 2) {
+                printf("%s - incorrect number of arguments. Try `help %s'\n",
+                    cmdname, cmdname);
+                return CMD_FAILURE;
         }
 
-        printf(":\n");
-        for (i = 1; i < argc; i++)
-                printf("[%d] -> %s\n", i, argv[i]);
+        ret = decimal_to_useconds(argv[1], &duration);
+        if (ret != EOK) {
+                printf("%s - invalid duration.\n", cmdname);
+                return CMD_FAILURE;
+        }
+
+        (void) usleep(duration);
 
         return CMD_SUCCESS;