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

Timestamp:

2018-10-03T08:34:52Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b209135

Parents:

174156fd

git-author:

Jiri Svoboda <jiri@…> (2018-10-02 21:31:25)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-03 08:34:52)

Message:

Allow creating ext2 dynamic revision. Allow choosing ext filesystem version by mkext4 argument. Fix support for filesystems without filetype feature.

File:

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

uspace/app/mkext4/mkext4.c

@@ -45 +45 @@
 
 static void syntax_print(void);
+static errno_t ext4_version_parse(const char *, ext4_cfg_ver_t *);
 
 int main(int argc, char **argv)
@@ -51 +52 @@
         char *dev_path;
         service_id_t service_id;
+        ext4_cfg_ver_t ver;
         char *endptr;
         aoff64_t nblocks;
         char *label;
+
+        ver = ext4_def_fs_version;
 
         if (argc < 2) {
@@ -76 +80 @@
                         nblocks = strtol(*argv, &endptr, 10);
                         if (*endptr != '\0') {
+                                printf(NAME ": Error, invalid argument.\n");
+                                syntax_print();
+                                return 1;
+                        }
+
+                        --argc;
+                        ++argv;
+                }
+
+                if (str_cmp(*argv, "--type") == 0) {
+                        --argc;
+                        ++argv;
+                        if (*argv == NULL) {
+                                printf(NAME ": Error, argument missing.\n");
+                                syntax_print();
+                                return 1;
+                        }
+
+                        rc = ext4_version_parse(*argv, &ver);
+                        if (rc != EOK) {
                                 printf(NAME ": Error, invalid argument.\n");
                                 syntax_print();
@@ -125 +149 @@
         (void) nblocks;
 
-        rc = ext4_filesystem_create(service_id);
+        rc = ext4_filesystem_create(ver, service_id);
         if (rc != EOK) {
                 printf(NAME ": Error initializing file system.\n");
@@ -141 +165 @@
         printf("options:\n"
             "\t--size <sectors> Filesystem size, overrides device size\n"
-            "\t--label <label>  Volume label\n");
+            "\t--label <label>  Volume label\n"
+            "\t--type <fstype>  Filesystem type (ext2, ext2old)\n");
+}
+
+static errno_t ext4_version_parse(const char *str, ext4_cfg_ver_t *ver)
+{
+        if (str_cmp(str, "ext2old") == 0) {
+                *ver = extver_ext2_old;
+                return EOK;
+        }
+
+        if (str_cmp(str, "ext2") == 0) {
+                *ver = extver_ext2;
+                return EOK;
+        }
+
+        return EINVAL;
 }