X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=3e44c3b069794b81a1e61338c98eef0fa7671bf3;hp=d8302bc22923ede0a52d345107b5682a66a1955e;hb=86d9bf4bece6d42d2ed91e99bf2773c6b5c30ec3;hpb=f640b32fddfc45210361813b50c629a80d2889d2 diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index d8302bc22..3e44c3b06 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -3,19 +3,18 @@ * * Copyright (C) 2005-2008 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 - * Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 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 Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #ifndef _GNU_SOURCE @@ -32,6 +31,8 @@ #include #include #include +#include +#include #include #include "../../udev/udev.h" @@ -40,6 +41,7 @@ #define BLKGETSIZE64 _IOR(0x12,114,size_t) static int debug; +struct udev *udev_ctx; static void log_fn(struct udev *udev, int priority, const char *file, int line, const char *fn, @@ -57,44 +59,14 @@ static void vid_log(int priority, const char *file, int line, const char *format { va_list args; + if (priority > udev_get_log_priority(udev_ctx)) + return; va_start(args, format); - log_fn(NULL, priority, file, line, NULL, format, args); + log_fn(udev_ctx, priority, file, line, NULL, format, args); va_end(args); 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 (len && isspace(from[len-1])) - len--; - - /* strip leading whitespace */ - i = 0; - while (isspace(from[i]) && (i < len)) - i++; - - j = 0; - while (i < len) { - /* substitute multiple whitespace */ - if (isspace(from[i])) { - while (isspace(from[i])) - i++; - to[j++] = '_'; - } - /* skip chars */ - if (from[i] == '/') { - i++; - continue; - } - to[j++] = from[i++]; - } - 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) @@ -110,18 +82,18 @@ static int all_probers(volume_id_probe_fn_t probe_fn, int main(int argc, char *argv[]) { - struct udev *udev; 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' }, - { "offset", 2, NULL, 'o' }, - { "debug", 0, NULL, 'd' }, - { "help", 0, NULL, 'h' }, + { "label", no_argument, NULL, 'l' }, + { "label-raw", no_argument, NULL, 'L' }, + { "uuid", no_argument, NULL, 'u' }, + { "type", no_argument, NULL, 't' }, + { "export", no_argument, NULL, 'x' }, + { "skip-raid", no_argument, NULL, 's' }, + { "size", required_argument, NULL, 'S' }, + { "probe-all", no_argument, NULL, 'a' }, + { "offset", optional_argument, NULL, 'o' }, + { "debug", no_argument, NULL, 'd' }, + { "help", no_argument, NULL, 'h' }, {} }; @@ -136,22 +108,26 @@ int main(int argc, char *argv[]) struct volume_id *vid = NULL; char label_safe[256]; char label_enc[256]; + char uuid_safe[256]; char uuid_enc[256]; - uint64_t size; + char uuid_sub_enc[256]; + char type_enc[256]; + char type_version_enc[256]; + uint64_t size = 0; int skip_raid = 0; int probe_all = 0; uint64_t offset = 0; const char *node; int fd; - const char *label, *uuid, *type, *type_version, *usage; + const char *label, *uuid, *uuid_sub, *type, *type_version, *usage; int retval; int rc = 0; - udev = udev_new(); - if (udev == NULL) + udev_ctx = udev_new(); + if (udev_ctx == NULL) goto exit; logging_init("vol_id"); - udev_set_log_fn(udev, log_fn); + udev_set_log_fn(udev_ctx, log_fn); /* hook in our debug into libvolume_id */ volume_id_log_fn = vid_log; @@ -159,15 +135,15 @@ int main(int argc, char *argv[]) while (1) { int option; - option = getopt_long(argc, argv, "lLutxsaodh", options, NULL); + option = getopt_long(argc, argv, "lLutxsS:aodh", options, NULL); if (option == -1) break; switch (option) { case 'd': debug = 1; - if (udev_get_log_priority(udev) < LOG_INFO) - udev_set_log_priority(udev, LOG_INFO); + if (udev_get_log_priority(udev_ctx) < LOG_INFO) + udev_set_log_priority(udev_ctx, LOG_INFO); break; case 'l': print = PRINT_LABEL; @@ -190,6 +166,10 @@ int main(int argc, char *argv[]) case 'a': probe_all = 1; break; + case 'S': + if (optarg[0] != '\0') + size = strtoull(optarg, NULL, 0); + break; case 'o': if (optarg[0] != '\0') offset = strtoull(optarg, NULL, 0); @@ -204,6 +184,7 @@ int main(int argc, char *argv[]) " --skip-raid don't probe for raid\n" " --probe-all find possibly conflicting signatures\n" " --offset= probe at the given offset\n" + " --size= overwrite device size\n" " --debug print debug output to stderr\n" " --help\n\n"); goto exit; @@ -215,7 +196,7 @@ int main(int argc, char *argv[]) node = argv[optind]; if (!node) { - err(udev, "no device\n"); + err(udev_ctx, "no device\n"); fprintf(stderr, "no device\n"); rc = 1; goto exit; @@ -234,9 +215,19 @@ int main(int argc, char *argv[]) goto exit; } - if (ioctl(fd, BLKGETSIZE64, &size) != 0) - size = 0; - info(udev, "BLKGETSIZE64=%llu (%lluGB)\n", (unsigned long long)size, (unsigned long long)size >> 30); + if (size == 0) { + if (ioctl(fd, BLKGETSIZE64, &size) == 0) { + info(udev_ctx, "BLKGETSIZE64=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30); + } else { + struct stat statbuf; + + if (fstat(fd, &statbuf) == 0 && S_ISREG(statbuf.st_mode)) + size = statbuf.st_size; + else + size = 0; + info(udev_ctx, "stat=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30); + } + } /* try to drop all privileges before reading disk content */ if (getuid() == 0) { @@ -247,7 +238,7 @@ int main(int argc, char *argv[]) if (setgroups(0, NULL) != 0 || setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) - info(udev, "unable to drop privileges: %s\n\n", strerror(errno)); + info(udev_ctx, "unable to drop privileges: %s\n\n", strerror(errno)); } } @@ -261,7 +252,8 @@ int main(int argc, char *argv[]) else retval = volume_id_probe_all(vid, offset, size); if (retval != 0) { - fprintf(stderr, "%s: unknown volume type\n", node); + fprintf(stderr, "unknown or non-unique volume type " + "(--probe-all lists possibly conflicting types)\n"); rc = 4; goto exit; } @@ -270,27 +262,36 @@ int main(int argc, char *argv[]) !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)) { + !volume_id_get_uuid(vid, &uuid) || + !volume_id_get_uuid_sub(vid, &uuid_sub)) { rc = 4; goto exit; } - set_str(label_safe, label, sizeof(label_safe)); - replace_chars(label_safe, ALLOWED_CHARS_INPUT); - + udev_util_replace_whitespace(label, label_safe, sizeof(label_safe)); + udev_util_replace_chars(label_safe, UDEV_ALLOWED_CHARS_INPUT); volume_id_encode_string(label, label_enc, sizeof(label_enc)); + + udev_util_replace_whitespace(uuid, uuid_safe, sizeof(uuid_safe)); + udev_util_replace_chars(uuid_safe, UDEV_ALLOWED_CHARS_INPUT); volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc)); + volume_id_encode_string(uuid_sub, uuid_sub_enc, sizeof(uuid_sub_enc)); + + volume_id_encode_string(type, type_enc, sizeof(type_enc)); + volume_id_encode_string(type_version, type_version_enc, sizeof(type_version_enc)); + switch (print) { case PRINT_EXPORT: 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_TYPE=%s\n", type_enc); + printf("ID_FS_VERSION=%s\n", type_version_enc); + printf("ID_FS_UUID=%s\n", uuid_safe); printf("ID_FS_UUID_ENC=%s\n", uuid_enc); - printf("ID_FS_LABEL=%s\n", label); + if (uuid_sub_enc[0] != '\0') + printf("ID_FS_UUID_SUB_ENC=%s\n", uuid_sub_enc); + printf("ID_FS_LABEL=%s\n", label_safe); 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); @@ -321,7 +322,7 @@ int main(int argc, char *argv[]) exit: if (vid != NULL) volume_id_close(vid); - udev_unref(udev); + udev_unref(udev_ctx); logging_close(); return rc; }