Changeset ab936440 in mainline for uspace/app/mkext4/mkext4.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

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;
@@ -68 +69 @@
         ++argv;
 
-        while (*argv[0] == '-') {
+        while (*argv && *argv[0] == '-') {
                 if (str_cmp(*argv, "--size") == 0) {
                         --argc;
@@ -87 +88 @@
                         --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;
                 }
 
@@ -107 +130 @@
                         --argc;
                         ++argv;
+                        continue;
                 }
 
@@ -122 +146 @@
                         --argc;
                         ++argv;
+                        continue;
+                }
+
+                if (str_cmp(*argv, "--help") == 0) {
+                        syntax_print();
+                        return 0;
                 }
 
@@ -128 +158 @@
                         ++argv;
                         break;
+                } else {
+                        printf(NAME ": Invalid argument: %s\n", *argv);
+                        syntax_print();
+                        return 1;
                 }
         }
@@ -147 +181 @@
 
         cfg.volume_name = label;
+        cfg.bsize = bsize;
         (void) nblocks;
 
@@ -166 +201 @@
             "\t--size <sectors> Filesystem size, overrides device size\n"
             "\t--label <label>  Volume label\n"
-            "\t--type <fstype>  Filesystem type (ext2, ext2old)\n");
+            "\t--type <fstype>  Filesystem type (ext2, ext2old)\n"
+            "\t--bsize <bytes>  Filesystem block size in bytes (default = 4096)\n");
 }