Changeset 6abdef37 in mainline for uspace/app/mkext4/mkext4.c

Timestamp:

2018-12-11T14:02:08Z (5 years ago)

Author:

Maurizio Lombardi <mlombard@…>

Branches:

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

Children:

c9c1ccd

Parents:

9c3038d

Message:

mkext4: fix infinite loop when passing an invalid argument.

Also adds the —help parameter.

File:

• uspace/app/mkext4/mkext4.c (modified) (5 diffs)

uspace/app/mkext4/mkext4.c

@@ -68 +68 @@
         ++argv;
 
-        while (*argv[0] == '-') {
+        while (*argv && *argv[0] == '-') {
                 if (str_cmp(*argv, "--size") == 0) {
                         --argc;
@@ -87 +87 @@
                         --argc;
                         ++argv;
+                        continue;
                 }
 
@@ -107 +108 @@
                         --argc;
                         ++argv;
+                        continue;
                 }
 
@@ -122 +124 @@
                         --argc;
                         ++argv;
+                        continue;
+                }
+
+                if (str_cmp(*argv, "--help") == 0) {
+                        syntax_print();
+                        return 0;
                 }
 
@@ -128 +136 @@
                         ++argv;
                         break;
+                } else {
+                        printf(NAME ": Invalid argument: %s\n", *argv);
+                        syntax_print();
+                        return 1;
                 }
         }