chiark / gitweb /
vol_id: use volume_id_get_*
[elogind.git] / extras / volume_id / vol_id.c
index 92f00e0c50006f2ee43c6cb024bc340d8257a7d6..fbf9832b50efacfa3e2a66d4ae55c0f790cb21b5 100644 (file)
@@ -30,6 +30,8 @@
 #include <errno.h>
 #include <pwd.h>
 #include <grp.h>
+#include <getopt.h>
+#include <fcntl.h>
 #include <sys/ioctl.h>
 
 #include "../../udev.h"
@@ -111,31 +113,35 @@ static void set_str(char *to, const char *from, size_t count)
 
 int main(int argc, char *argv[])
 {
-       const char help[] = "Usage: vol_id [options] <device>\n"
-                           " --export        export key/value pairs\n"
-                           "  -t             filesystem type\n"
-                           "  -l             filesystem label\n"
-                           "  -u             filesystem uuid\n"
-                           "  -L             raw label\n"
-                           " --skip-raid     don't probe for raid\n"
-                           " --probe-all     find possibly conflicting signatures\n"
-                           " --help\n"
-                           "\n";
+       static const struct option options[] = {
+               { "label", 0, NULL, 'l' },
+               { "label-raw", 0, NULL, 'L' },
+               { "uuid", 0, NULL, 'u' },
+               { "type", 0, NULL, 't' },
+               { "export", 0, NULL, 'x' },
+               { "skip-raid", 0, NULL, 's' },
+               { "probe-all", 0, NULL, 'a' },
+               { "help", 0, NULL, 'h' },
+               {}
+       };
+
        enum print_type {
                PRINT_EXPORT,
                PRINT_TYPE,
                PRINT_LABEL,
                PRINT_UUID,
-               PRINT_RAW_LABEL,
+               PRINT_LABEL_RAW,
        } print = PRINT_EXPORT;
+
        struct volume_id *vid = NULL;
-       static char name[VOLUME_ID_LABEL_SIZE];
-       int i;
+       char name[128];
        uint64_t size;
        int skip_raid = 0;
        int probe_all = 0;
-       const char *node = NULL;
+       const char *node;
        struct passwd *pw;
+       int fd;
+       const char *label, *uuid, *type, *type_version, *usage;
        int retval;
        int rc = 0;
 
@@ -144,46 +150,76 @@ int main(int argc, char *argv[])
        /* hook in our debug into libvolume_id */
        volume_id_log_fn = vid_log;
 
-       for (i = 1 ; i < argc; i++) {
-               char *arg = argv[i];
+       while (1) {
+               int option;
 
-               if (strcmp(arg, "--export") == 0) {
-                       print = PRINT_EXPORT;
-               } else if (strcmp(arg, "-t") == 0) {
-                       print = PRINT_TYPE;
-               } else if (strcmp(arg, "-l") == 0) {
+               option = getopt_long(argc, argv, "lLutxsah", options, NULL);
+               if (option == -1)
+                       break;
+
+               switch (option) {
+               case 'l':
                        print = PRINT_LABEL;
-               } else if (strcmp(arg, "-u") == 0) {
+                       break;
+               case 'L':
+                       print = PRINT_LABEL_RAW;
+                       break;
+               case 'u':
                        print = PRINT_UUID;
-               } else if (strcmp(arg, "-L") == 0) {
-                       print = PRINT_RAW_LABEL;
-               } else if (strcmp(arg, "--skip-raid") == 0) {
+                       break;
+               case 't':
+                       print = PRINT_TYPE;
+                       break;
+               case 'x':
+                       print = PRINT_EXPORT;
+                       break;
+               case 's':
                        skip_raid = 1;
-               } else if (strcmp(arg, "--probe-all") == 0) {
+                       break;
+               case 'a':
                        probe_all = 1;
-               } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
-                       printf(help);
+                       break;
+               case 'h':
+                       printf("Usage: vol_id [options] <device>\n"
+                           " --export        export key/value pairs\n"
+                           " --type          filesystem type\n"
+                           " --label         filesystem label\n"
+                           " --label-raw     raw label\n"
+                           " --uuid          filesystem uuid\n"
+                           " --skip-raid     don't probe for raid\n"
+                           " --probe-all     find possibly conflicting signatures\n"
+                           " --help\n\n");
+                       goto exit;
+               default:
+                       retval = 1;
                        goto exit;
-               } else
-                       node = arg;
+               }
        }
+
+       node = argv[optind];
        if (!node) {
-               err("no node specified");
-               fprintf(stderr, help);
+               err("no device");
+               fprintf(stderr, "no device\n");
                rc = 1;
                goto exit;
        }
 
-       vid = volume_id_open_node(node);
+       fd = open(node, O_RDONLY);
+       if (fd < 0) {
+               fprintf(stderr, "%s: error opening volume\n", node);
+               rc = 2;
+               goto exit;
+       }
+
+       vid = volume_id_open_fd(fd);
        if (vid == NULL) {
-               fprintf(stderr, "%s: error open volume\n", node);
                rc = 2;
                goto exit;
        }
 
-       if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0)
+       if (ioctl(fd, BLKGETSIZE64, &size) != 0)
                size = 0;
-       dbg("BLKGETSIZE64=%llu", size);
+       dbg("BLKGETSIZE64=%llu", (unsigned long long)size);
 
        /* try to drop all privileges before reading disk content */
        pw = getpwnam ("nobody");
@@ -201,74 +237,107 @@ int main(int argc, char *argv[])
 
        if (probe_all) {
                if (volume_id_probe_linux_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_intel_software_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_lsi_mega_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_via_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_silicon_medley_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_nvidia_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_promise_fasttrack_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_highpoint_45x_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_adaptec_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_jmicron_raid(vid, 0, size) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_vfat(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_linux_swap(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_luks(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_xfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_ext(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_reiserfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_jfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_udf(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_iso9660(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_hfs_hfsplus(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_ufs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_ntfs(vid, 0, 0)  == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_cramfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_romfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_hpfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_sysv(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_minix(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_ocfs1(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_ocfs2(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_vxfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_squashfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_netware(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_gfs(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                if (volume_id_probe_gfs2(vid, 0, 0) == 0)
-                       printf("%s\n", vid->type);
-
+                       if (volume_id_get_type(vid, &type))
+                               printf("%s\n", type);
                goto exit;
        }
 
@@ -282,41 +351,49 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
-       set_str(name, vid->label, sizeof(vid->label));
+       if (!volume_id_get_label(vid, &label) ||
+           !volume_id_get_usage(vid, &usage) ||
+           !volume_id_get_type(vid, &type) ||
+           !volume_id_get_type_version(vid, &type_version) ||
+           !volume_id_get_uuid(vid, &uuid)) {
+               rc = 4;
+               goto exit;
+       }
+       set_str(name, label, sizeof(name));
        replace_untrusted_chars(name);
 
        switch (print) {
        case PRINT_EXPORT:
-               printf("ID_FS_USAGE=%s\n", vid->usage);
-               printf("ID_FS_TYPE=%s\n", vid->type);
-               printf("ID_FS_VERSION=%s\n", vid->type_version);
-               printf("ID_FS_UUID=%s\n", vid->uuid);
-               printf("ID_FS_LABEL=%s\n", vid->label);
+               printf("ID_FS_USAGE=%s\n", usage);
+               printf("ID_FS_TYPE=%s\n", type);
+               printf("ID_FS_VERSION=%s\n", type_version);
+               printf("ID_FS_UUID=%s\n", uuid);
+               printf("ID_FS_LABEL=%s\n", label);
                printf("ID_FS_LABEL_SAFE=%s\n", name);
                break;
        case PRINT_TYPE:
-               printf("%s\n", vid->type);
+               printf("%s\n", type);
                break;
        case PRINT_LABEL:
-               if (name[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) {
+               if (name[0] == '\0' || strcmp(usage, "raid") == 0) {
                        rc = 3;
                        goto exit;
                }
                printf("%s\n", name);
                break;
        case PRINT_UUID:
-               if (vid->uuid[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) {
+               if (uuid[0] == '\0' || strcmp(usage, "raid") == 0) {
                        rc = 4;
                        goto exit;
                }
-               printf("%s\n", vid->uuid);
+               printf("%s\n", uuid);
                break;
-       case PRINT_RAW_LABEL:
-               if (vid->label[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) {
+       case PRINT_LABEL_RAW:
+               if (label[0] == '\0' || strcmp(usage, "raid") == 0) {
                        rc = 3;
                        goto exit;
                }
-               printf("%s\n", vid->label);
+               printf("%s\n", label);
                break;
        }