#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,
{
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;
}
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' },
{}
};
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 type_enc[256];
+ char type_version_enc[256];
+ uint64_t size = 0;
int skip_raid = 0;
int probe_all = 0;
uint64_t offset = 0;
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;
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;
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);
" --skip-raid don't probe for raid\n"
" --probe-all find possibly conflicting signatures\n"
" --offset=<bytes> probe at the given offset\n"
+ " --size=<bytes> overwrite device size\n"
" --debug print debug output to stderr\n"
" --help\n\n");
goto exit;
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;
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)
+ size = 0;
+ info(udev_ctx, "BLKGETSIZE64=%llu (%lluGB)\n", (unsigned long long)size, (unsigned long long)size >> 30);
+ }
/* try to drop all privileges before reading disk content */
if (getuid() == 0) {
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));
}
}
}
set_str(label_safe, label, sizeof(label_safe));
- replace_chars(label_safe, ALLOWED_CHARS_INPUT);
-
+ util_replace_chars(label_safe, ALLOWED_CHARS_INPUT);
volume_id_encode_string(label, label_enc, sizeof(label_enc));
+
+ set_str(uuid_safe, uuid, sizeof(uuid_safe));
+ util_replace_chars(uuid_safe, ALLOWED_CHARS_INPUT);
volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_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);
+ 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);
exit:
if (vid != NULL)
volume_id_close(vid);
- udev_unref(udev);
+ udev_unref(udev_ctx);
logging_close();
return rc;
}
~ianmdlvl / elogind.git / blobdiff