Changes in uspace/app/mkext4/mkext4.c [4bb4cf88:6ba36a0] in mainline

File:

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

uspace/app/mkext4/mkext4.c

@@ -56 +56 @@
         aoff64_t nblocks;
         const char *label = "";
-        unsigned int bsize = 4096;
 
         cfg.version = ext4_def_fs_version;
@@ -69 +68 @@
         ++argv;
 
-        while (*argv && *argv[0] == '-') {
+        while (*argv[0] == '-') {
                 if (str_cmp(*argv, "--size") == 0) {
                         --argc;
@@ -88 +87 @@
                         --argc;
                         ++argv;
-                        continue;
-                }
-
-                if (str_cmp(*argv, "--bsize") == 0) {
-                        --argc;
-                        ++argv;
-                        if (*argv == NULL) {
-                                printf(NAME ": Error, argument missing.\n");
-                                syntax_print();
-                                return 1;
-                        }
-
-                        bsize = strtol(*argv, &endptr, 10);
-                        if (*endptr != '\0') {
-                                printf(NAME ": Error, invalid argument.\n");
-                                syntax_print();
-                                return 1;
-                        }
-
-                        --argc;
-                        ++argv;
-                        continue;
                 }
 
@@ -130 +107 @@
                         --argc;
                         ++argv;
-                        continue;
                 }
 
@@ -146 +122 @@
                         --argc;
                         ++argv;
-                        continue;
-                }
-
-                if (str_cmp(*argv, "--help") == 0) {
-                        syntax_print();
-                        return 0;
                 }
 
@@ -158 +128 @@
                         ++argv;
                         break;
-                } else {
-                        printf(NAME ": Invalid argument: %s\n", *argv);
-                        syntax_print();
-                        return 1;
                 }
         }
@@ -181 +147 @@
 
         cfg.volume_name = label;
-        cfg.bsize = bsize;
         (void) nblocks;
 
@@ -201 +166 @@
             "\t--size <sectors> Filesystem size, overrides device size\n"
             "\t--label <label>  Volume label\n"
-            "\t--type <fstype>  Filesystem type (ext2, ext2old)\n"
-            "\t--bsize <bytes>  Filesystem block size in bytes (default = 4096)\n");
+            "\t--type <fstype>  Filesystem type (ext2, ext2old)\n");
 }