releasing package exfatprogs version 1.2.3-1

[sven/exfatprogs.git] / tune / tune.c

diff --git a/tune/tune.c b/tune/tune.c
index 135f624018e22e7b1263958084a657062affbf8a..4966e0a1783a1815e8d0aef61ab0613f584e2155 100644 (file)
--- a/tune/tune.c
+++ b/tune/tune.c
@@ -20,6 +20,8 @@ static void usage(void)
        fprintf(stderr, "Usage: tune.exfat\n");
        fprintf(stderr, "\t-l | --print-label                    Print volume label\n");
        fprintf(stderr, "\t-L | --set-label=label                Set volume label\n");
+       fprintf(stderr, "\t-u | --print-guid                     Print volume GUID\n");
+       fprintf(stderr, "\t-U | --set-guid=guid                  Set volume GUID\n");
        fprintf(stderr, "\t-i | --print-serial                   Print volume serial\n");
        fprintf(stderr, "\t-I | --set-serial=value               Set volume serial\n");
        fprintf(stderr, "\t-V | --version                        Show version\n");
@@ -32,6 +34,8 @@ static void usage(void)
 static struct option opts[] = {
        {"print-label",         no_argument,            NULL,   'l' },
        {"set-label",           required_argument,      NULL,   'L' },
+       {"print-guid",          no_argument,            NULL,   'u' },
+       {"set-guid",            required_argument,      NULL,   'U' },
        {"print-serial",        no_argument,            NULL,   'i' },
        {"set-serial",          required_argument,      NULL,   'I' },
        {"version",             no_argument,            NULL,   'V' },
@@ -45,6 +49,7 @@ int main(int argc, char *argv[])
 {
        int c;
        int ret = EXIT_FAILURE;
+       unsigned long volume_serial;
        struct exfat_blk_dev bd;
        struct exfat_user_input ui;
        bool version_only = false;
@@ -59,7 +64,7 @@ int main(int argc, char *argv[])
                exfat_err("failed to init locale/codeset\n");
 
        opterr = 0;
-       while ((c = getopt_long(argc, argv, "I:iL:lVvh", opts, NULL)) != EOF)
+       while ((c = getopt_long(argc, argv, "I:iL:lU:uVvh", opts, NULL)) != EOF)
                switch (c) {
                case 'l':
                        flags = EXFAT_GET_VOLUME_LABEL;
@@ -69,11 +74,29 @@ int main(int argc, char *argv[])
                                        optarg);
                        flags = EXFAT_SET_VOLUME_LABEL;
                        break;
+               case 'u':
+                       flags = EXFAT_GET_VOLUME_GUID;
+                       break;
+               case 'U':
+                       if (*optarg != '\0' && *optarg != '\r')
+                               ui.guid = optarg;
+                       flags = EXFAT_SET_VOLUME_GUID;
+                       break;
                case 'i':
                        flags = EXFAT_GET_VOLUME_SERIAL;
                        break;
                case 'I':
-                       ui.volume_serial = strtoul(optarg, NULL, 0);
+                       ret = exfat_parse_ulong(optarg, &volume_serial);
+                       if (volume_serial > UINT_MAX)
+                               ret = -ERANGE;
+
+
+                       if (ret < 0) {
+                               exfat_err("invalid serial number(%s)\n", optarg);
+                               goto out;
+                       }
+
+                       ui.volume_serial = volume_serial;
                        flags = EXFAT_SET_VOLUME_SERIAL;
                        break;
                case 'V':
@@ -117,7 +140,6 @@ int main(int argc, char *argv[])
 
        exfat = exfat_alloc_exfat(&bd, bs);
        if (!exfat) {
-               free(bs);
                ret = -ENOMEM;
                goto close_fd_out;
        }
@@ -140,6 +162,11 @@ int main(int argc, char *argv[])
                ret = exfat_read_volume_label(exfat);
        else if (flags == EXFAT_SET_VOLUME_LABEL)
                ret = exfat_set_volume_label(exfat, label_input);
+       else if (flags == EXFAT_GET_VOLUME_GUID)
+               ret = exfat_read_volume_guid(exfat);
+       else if (flags == EXFAT_SET_VOLUME_GUID)
+               ret = exfat_set_volume_guid(exfat, ui.guid);
+
 close_fd_out:
        close(bd.dev_fd);
        if (exfat)