vol_id: fix logging glue

[elogind.git] / extras / volume_id / vol_id.c

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index b47d6a4ecb1792819d2ba961542291c542cda3d2..2b487d0b3c51f635862a094ac8c56d46020dd5e0 100644 (file)
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -57,8 +57,10 @@ 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);
-       udev_log(udev_ctx, priority, file, line, NULL, format, args);
+       log_fn(udev_ctx, priority, file, line, NULL, format, args);
        va_end(args);
        return;
 }
@@ -111,16 +113,17 @@ static int all_probers(volume_id_probe_fn_t probe_fn,
 int main(int argc, char *argv[])
 {
        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,7 +139,7 @@ int main(int argc, char *argv[])
        char label_safe[256];
        char label_enc[256];
        char uuid_enc[256];
-       uint64_t size;
+       uint64_t size = 0;
        int skip_raid = 0;
        int probe_all = 0;
        uint64_t offset = 0;
@@ -158,7 +161,7 @@ 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;
 
@@ -189,6 +192,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);
@@ -203,6 +210,7 @@ int main(int argc, char *argv[])
                            " --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;
@@ -233,9 +241,11 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
-       if (ioctl(fd, BLKGETSIZE64, &size) != 0)
-               size = 0;
-       info(udev_ctx, "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) {