X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=7bdfda17e7ab5b967ac923935cbee08c7351e140;hp=a4a866cfcf6d040e952fd6c0bc6ab8d77ba6fe09;hb=708cb3594139f28f7d99b4ea1cf91b4ccd032273;hpb=39e54555a961fa6c4c8e7d260a0e208439dc0cfa diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index a4a866cfc..7bdfda17e 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -1,7 +1,7 @@ /* - * vol_id - udev callout to read filesystem label and uuid + * vol_id - read filesystem label and uuid * - * Copyright (C) 2005 Kay Sievers + * Copyright (C) 2005-2006 Kay Sievers * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -27,11 +27,11 @@ #include #include #include +#include #include -#include "../../udev_utils.h" -#include "../../logging.h" -#include "volume_id/volume_id.h" +#include "../../udev.h" +#include "lib/libvolume_id.h" #define BLKGETSIZE64 _IOR(0x12,114,size_t) @@ -60,42 +60,63 @@ void log_message(int priority, const char *format, ...) } #endif -static void set_str(char *to, const unsigned char *from, int count) +static void vid_log(int priority, const char *file, int line, const char *format, ...) { - int i, j; - int len; +#ifdef USE_LOG + char log_str[1024]; + va_list args; + + va_start(args, format); + vsnprintf(log_str, sizeof(log_str), format, args); + log_str[sizeof(log_str)-1] = '\0'; + log_message(priority, "%s:%i %s", file, line, log_str); + va_end(args); +#endif + return; +} + +static void set_str(char *to, const char *from, size_t count) +{ + size_t i, j, len; + /* strip trailing whitespace */ len = strnlen(from, count); - while (isspace(from[len-1])) + while (len && isspace(from[len-1])) len--; + /* strip leading whitespace */ i = 0; while (isspace(from[i]) && (i < len)) i++; j = 0; while (i < len) { - switch(from[i]) { - case '/': - break; - case ' ': + /* substitute multiple whitespace */ + if (isspace(from[i])) { + while (isspace(from[i])) + i++; to[j++] = '_'; - break; - default: - to[j++] = from[i]; } - i++; + /* skip chars */ + if (from[i] == '/') { + i++; + continue; + } + to[j++] = from[i++]; } to[j] = '\0'; } int main(int argc, char *argv[]) { - const char help[] = "usage: vol_id [--export|-t|-l|-u] \n" - " --export\n" - " -t filesystem type\n" - " -l filesystem label\n" - " -u filesystem uuid\n" + const char help[] = "Usage: vol_id [options] \n" + " --export export key/value pairs\n" + " -t filesystem type\n" + " -l filesystem label\n" + " -u filesystem uuid\n" + " --skip-raid don't probe for raid\n" + " --probe-all find possibly conflicting signatures\n" + " --help\n" "\n"; enum print_type { PRINT_EXPORT, @@ -106,12 +127,20 @@ int main(int argc, char *argv[]) struct volume_id *vid = NULL; static char name[VOLUME_ID_LABEL_SIZE]; int i; - unsigned long long size; + uint64_t size; + int skip_raid = 0; + int probe_all = 0; const char *node = NULL; + uid_t nobody_uid; + gid_t nobody_gid; + int retval; int rc = 0; logging_init("vol_id"); + /* hook in our debug into libvolume_id */ + volume_id_log_fn = vid_log; + for (i = 1 ; i < argc; i++) { char *arg = argv[i]; @@ -123,6 +152,13 @@ int main(int argc, char *argv[]) print = PRINT_LABEL; } else if (strcmp(arg, "-u") == 0) { print = PRINT_UUID; + } else if (strcmp(arg, "--skip-raid") == 0) { + skip_raid = 1; + } else if (strcmp(arg, "--probe-all") == 0) { + probe_all = 1; + } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { + printf(help); + goto exit; } else node = arg; } @@ -142,17 +178,105 @@ int main(int argc, char *argv[]) if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0) size = 0; + dbg("BLKGETSIZE64=%llu", size); + + /* drop all privileges */ + nobody_uid = lookup_user("nobody"); + nobody_gid = lookup_group("nogroup"); + if (nobody_uid > 0 && nobody_gid > 0) { + if (setgroups(0, NULL) != 0 || + setgid(nobody_gid) != 0 || + setuid(nobody_uid) != 0) { + rc = 3; + goto exit; + } + } - if (volume_id_probe_all(vid, 0, size) == 0) - goto print; + if (probe_all) { + if (volume_id_probe_linux_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_intel_software_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_lsi_mega_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_via_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_silicon_medley_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_nvidia_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_promise_fasttrack_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_highpoint_45x_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_adaptec_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_jmicron_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_vfat(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_linux_swap(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_luks(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_xfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ext(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_reiserfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_jfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_udf(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_iso9660(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_hfs_hfsplus(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ufs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ntfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_cramfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_romfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_hpfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_sysv(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_minix(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ocfs1(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ocfs2(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_vxfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_squashfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_netware(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_gfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_gfs2(vid, 0, 0) == 0) + printf("%s\n", vid->type); - if (print != PRINT_EXPORT) + goto exit; + } + + if (skip_raid) + retval = volume_id_probe_filesystem(vid, 0, size); + else + retval = volume_id_probe_all(vid, 0, size); + if (retval != 0) { fprintf(stderr, "%s: unknown volume type\n", node); - rc = 3; - goto exit; + rc = 4; + goto exit; + } -print: set_str(name, vid->label, sizeof(vid->label)); + replace_untrusted_chars(name); switch (print) { case PRINT_EXPORT: @@ -167,15 +291,14 @@ print: printf("%s\n", vid->type); break; case PRINT_LABEL: - if (name[0] == '\0' || - (vid->usage_id != VOLUME_ID_FILESYSTEM && vid->usage_id != VOLUME_ID_DISKLABEL)) { + if (name[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) { rc = 3; goto exit; } printf("%s\n", name); break; case PRINT_UUID: - if (vid->uuid[0] == '\0' || vid->usage_id != VOLUME_ID_FILESYSTEM) { + if (vid->uuid[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) { rc = 4; goto exit; }