chiark / gitweb /
volume_id: respect LDFLAGS
[elogind.git] / extras / volume_id / vol_id.c
index fbf9832b50efacfa3e2a66d4ae55c0f790cb21b5..38950ee85f408b6ae349a1a2924fba9a49eee431 100644 (file)
@@ -111,6 +111,19 @@ static void set_str(char *to, const char *from, size_t count)
        to[j] = '\0';
 }
 
+static int all_probers(volume_id_probe_fn_t probe_fn,
+                      struct volume_id *id, uint64_t off, uint64_t size,
+                      void *data)
+{
+       const char *type;
+
+       if (probe_fn(id, off, size) == 0)
+               if (volume_id_get_type(id, &type))
+                       printf("%s\n", type);
+
+       return 0;
+}
+
 int main(int argc, char *argv[])
 {
        static const struct option options[] = {
@@ -134,12 +147,13 @@ int main(int argc, char *argv[])
        } print = PRINT_EXPORT;
 
        struct volume_id *vid = NULL;
-       char name[128];
+       char label_safe[256];
+       char label_enc[256];
+       char uuid_enc[256];
        uint64_t size;
        int skip_raid = 0;
        int probe_all = 0;
        const char *node;
-       struct passwd *pw;
        int fd;
        const char *label, *uuid, *type, *type_version, *usage;
        int retval;
@@ -222,122 +236,20 @@ int main(int argc, char *argv[])
        dbg("BLKGETSIZE64=%llu", (unsigned long long)size);
 
        /* try to drop all privileges before reading disk content */
-       pw = getpwnam ("nobody");
-       if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) {
-               dbg("dropping privileges to %u:%u",
-                   (unsigned int)pw->pw_uid, (unsigned int)pw->pw_gid);
-               if (setgroups(0, NULL) != 0 ||
-                   setgid(pw->pw_gid) != 0 ||
-                   setuid(pw->pw_uid) != 0) {
-                       fprintf(stderr, "error dropping privileges: %s\n", strerror(errno));
-                       rc = 3;
-                       goto exit;
+       if (getuid() == 0) {
+               struct passwd *pw;
+
+               pw = getpwnam("nobody");
+               if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) {
+                       if (setgroups(0, NULL) != 0 ||
+                           setgid(pw->pw_gid) != 0 ||
+                           setuid(pw->pw_uid) != 0)
+                               info("unable to drop privileges: %s\n", strerror(errno));
                }
        }
 
        if (probe_all) {
-               if (volume_id_probe_linux_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_intel_software_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_lsi_mega_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_via_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_silicon_medley_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_nvidia_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_promise_fasttrack_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_highpoint_45x_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_adaptec_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_jmicron_raid(vid, 0, size) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_vfat(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_linux_swap(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_luks(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_xfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_ext(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_reiserfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_jfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_udf(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_iso9660(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_hfs_hfsplus(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_ufs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_ntfs(vid, 0, 0)  == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_cramfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_romfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_hpfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_sysv(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_minix(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_ocfs1(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_ocfs2(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_vxfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_squashfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_netware(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_gfs(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
-               if (volume_id_probe_gfs2(vid, 0, 0) == 0)
-                       if (volume_id_get_type(vid, &type))
-                               printf("%s\n", type);
+               volume_id_all_probers(all_probers, vid, 0, size, NULL);
                goto exit;
        }
 
@@ -359,8 +271,12 @@ int main(int argc, char *argv[])
                rc = 4;
                goto exit;
        }
-       set_str(name, label, sizeof(name));
-       replace_untrusted_chars(name);
+
+       set_str(label_safe, label, sizeof(label_safe));
+       replace_chars(label_safe, ALLOWED_CHARS_INPUT);
+
+       volume_id_encode_string(label, label_enc, sizeof(label_enc));
+       volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
 
        switch (print) {
        case PRINT_EXPORT:
@@ -368,25 +284,27 @@ int main(int argc, char *argv[])
                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_UUID_ENC=%s\n", uuid_enc);
                printf("ID_FS_LABEL=%s\n", label);
-               printf("ID_FS_LABEL_SAFE=%s\n", name);
+               printf("ID_FS_LABEL_ENC=%s\n", label_enc);
+               printf("ID_FS_LABEL_SAFE=%s\n", label_safe);
                break;
        case PRINT_TYPE:
                printf("%s\n", type);
                break;
        case PRINT_LABEL:
-               if (name[0] == '\0' || strcmp(usage, "raid") == 0) {
+               if (label_safe[0] == '\0' || strcmp(usage, "raid") == 0) {
                        rc = 3;
                        goto exit;
                }
-               printf("%s\n", name);
+               printf("%s\n", label_safe);
                break;
        case PRINT_UUID:
-               if (uuid[0] == '\0' || strcmp(usage, "raid") == 0) {
+               if (uuid_enc[0] == '\0' || strcmp(usage, "raid") == 0) {
                        rc = 4;
                        goto exit;
                }
-               printf("%s\n", uuid);
+               printf("%s\n", uuid_enc);
                break;
        case PRINT_LABEL_RAW:
                if (label[0] == '\0' || strcmp(usage, "raid") == 0) {