Changes in uspace/app/mkexfat/mkexfat.c [8d2dd7f2:f3504c1] in mainline

File:

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

uspace/app/mkexfat/mkexfat.c

@@ -46 +46 @@
 #include <byteorder.h>
 #include <align.h>
-#include <sys/typefmt.h>
 #include <str.h>
 #include <getopt.h>
@@ -102 +101 @@
         size_t   sector_size;
         size_t   cluster_size;
+        const char *label;
 } exfat_cfg_t;
-
 
 static unsigned log2(unsigned n);
@@ -127 +126 @@
         {"cluster-size", required_argument, 0, 'c'},
         {"fs-size", required_argument, 0, 's'},
+        {"label", required_argument, 0, 'L' },
 };
 
@@ -133 +133 @@
         printf("Usage: mkexfat [options] <device>\n"
             "-c, --cluster-size ## Specify the cluster size (Kb)\n"
-            "-s, --fs-size ##      Specify the filesystem size (sectors)\n");
+            "-s, --fs-size ##      Specify the filesystem size (sectors)\n"
+            "    --label ##        Volume label\n");
 }
 
@@ -598 +599 @@
         exfat_dentry_t *d;
         aoff64_t rootdir_sec;
+        uint16_t wlabel[EXFAT_VOLLABEL_LEN + 1];
         int rc;
         uint8_t *data;
@@ -609 +611 @@
 
         /* Initialize the volume label dentry */
-        d->type = EXFAT_TYPE_VOLLABEL;
-        str_to_utf16(d->vollabel.label, 8, "HELENOS ");
-        d->vollabel.size = 8;
-
-        d++;
+
+        if (cfg->label != NULL) {
+                memset(wlabel, 0, (EXFAT_VOLLABEL_LEN + 1) * sizeof(uint16_t));
+                rc = str_to_utf16(wlabel, EXFAT_VOLLABEL_LEN + 1, cfg->label);
+                if (rc != EOK) {
+                        rc = EINVAL;
+                        goto exit;
+                }
+
+                d->type = EXFAT_TYPE_VOLLABEL;
+                memcpy(d->vollabel.label, wlabel, EXFAT_VOLLABEL_LEN * 2);
+                d->vollabel.size = utf16_wsize(wlabel);
+                assert(d->vollabel.size <= EXFAT_VOLLABEL_LEN);
+
+                d++;
+        } else {
+                d->type = EXFAT_TYPE_VOLLABEL & ~EXFAT_TYPE_USED;
+        }
 
         /* Initialize the allocation bitmap dentry */
@@ -752 +767 @@
 
         cfg.cluster_size = 0;
+        cfg.label = NULL;
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "hs:c:",
+                c = getopt_long(argc, argv, "hs:c:L:",
                     long_options, &opt_ind);
                 switch (c) {
@@ -782 +798 @@
                         }
                         break;
+                case 'L':
+                        cfg.label = optarg;
+                        break;
                 }
         }