Changeset 0aa300d in mainline for uspace/app/sportdmp/sportdmp.c

Timestamp:

2012-07-29T23:08:51Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

5ea75f0

Parents:

dce39b4

Message:

sportdmp: make baud argument optional

File:

• uspace/app/sportdmp/sportdmp.c (modified) (3 diffs)

uspace/app/sportdmp/sportdmp.c

@@ -37 +37 @@
 static void syntax_print(void)
 {
-        fprintf(stderr, "Usage: sportdmp <baud> <device_service>\n");
+        fprintf(stderr, "Usage: sportdmp [--baud=<baud>] [device_service]\n");
 }
 
@@ -45 +45 @@
         sysarg_t baud = 9600;
         
-        if (argc > 1) {
+        int arg = 1;
+                
+        if (argc > arg && str_test_prefix(argv[arg], "--baud=")) {
+                size_t arg_offset = str_lsize(argv[arg], 7);
+                char* arg_str = argv[arg] + arg_offset;
+                if (str_length(arg_str) == 0) {
+                        fprintf(stderr, "--baud requires an argument\n");
+                        syntax_print();
+                        return 1;
+                }
                 char *endptr;
-                baud = strtol(argv[1], &endptr, 10);
+                baud = strtol(arg_str, &endptr, 10);
                 if (*endptr != '\0') {
                         fprintf(stderr, "Invalid value for baud\n");
@@ -53 +62 @@
                         return 1;
                 }
+                arg++;
         }
         
-        if (argc > 2) {
-                svc_path = argv[2];
+        if (argc > arg) {
+                svc_path = argv[arg];
+                arg++;
         }
         
-        if (argc > 3) {
+        if (argc > arg) {
+                fprintf(stderr, "Too many arguments\n");
                 syntax_print();
                 return 1;