releasing package exfatprogs version 1.2.8-1

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

diff --git a/tune/tune.c b/tune/tune.c
index 135f624018e22e7b1263958084a657062affbf8a..0aee4e664adec2a2d7310bfb13c88b4125e8880a 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,13 +49,13 @@ 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;
        int flags = 0;
        char label_input[VOLUME_LABEL_BUFFER_SIZE];
        struct exfat *exfat = NULL;
-       struct pbr *bs;
 
        init_user_input(&ui);
 
@@ -59,7 +63,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 +73,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':
@@ -92,11 +114,10 @@ int main(int argc, char *argv[])
        if (version_only)
                exit(EXIT_FAILURE);
 
-       if (argc < 3)
+       if (argc < 3 || argc - optind != 1)
                usage();
 
-       memset(ui.dev_name, 0, sizeof(ui.dev_name));
-       snprintf(ui.dev_name, sizeof(ui.dev_name), "%s", argv[argc - 1]);
+       ui.dev_name = argv[argc - 1];
 
        ret = exfat_get_blk_dev_info(&ui, &bd);
        if (ret < 0)
@@ -111,35 +132,21 @@ int main(int argc, char *argv[])
                goto close_fd_out;
        }
 
-       ret = read_boot_sect(&bd, &bs);
-       if (ret)
-               goto close_fd_out;
-
-       exfat = exfat_alloc_exfat(&bd, bs);
+       exfat = exfat_alloc_exfat(&bd, NULL, NULL);
        if (!exfat) {
-               free(bs);
                ret = -ENOMEM;
                goto close_fd_out;
        }
 
-       exfat->root = exfat_alloc_inode(ATTR_SUBDIR);
-       if (!exfat->root) {
-               ret = -ENOMEM;
-               goto close_fd_out;
-       }
-
-       exfat->root->first_clus = le32_to_cpu(exfat->bs->bsx.root_cluster);
-       if (exfat_root_clus_count(exfat)) {
-               exfat_err("failed to follow the cluster chain of root\n");
-               exfat_free_inode(exfat->root);
-               ret = -EINVAL;
-               goto close_fd_out;
-       }
-
        if (flags == EXFAT_GET_VOLUME_LABEL)
                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)