Changeset 3c8b0a8 in mainline for uspace/app

Timestamp:

2018-12-15T15:48:59Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

4bb4cf88

Parents:

b6d5e31 (diff), 6ea5e7a (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:

Maurizio Lombardi <m.lombardi85@…> (2018-12-15 15:48:59)

git-committer:

GitHub <noreply@…> (2018-12-15 15:48:59)

Message:

Merge pull request #143 from maurizio-lombardi/ext4_fixes_v2

Ext4 fixes

File:

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

uspace/app/mkext4/mkext4.c

@@ -56 +56 @@
         aoff64_t nblocks;
         const char *label = "";
+        unsigned int bsize = 1024;
 
         cfg.version = ext4_def_fs_version;
@@ -79 +80 @@
 
                         nblocks = strtol(*argv, &endptr, 10);
+                        if (*endptr != '\0') {
+                                printf(NAME ": Error, invalid argument.\n");
+                                syntax_print();
+                                return 1;
+                        }
+
+                        --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");
@@ -159 +181 @@
 
         cfg.volume_name = label;
+        cfg.bsize = bsize;
         (void) nblocks;
 
@@ -178 +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 = 1024)\n");
 }