udevadm: add --version --help options to man page, hide them as commands

[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 5c4e05d794837245dd8ce988c427997be0302f07..d8302bc22923ede0a52d345107b5682a66a1955e 100644 (file)
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -1,7 +1,7 @@
 /*
  * vol_id - read filesystem label and uuid
  *
- * Copyright (C) 2005-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2008 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     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
@@ -34,48 +34,32 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "../../udev.h"
+#include "../../udev/udev.h"
 #include "lib/libvolume_id.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
-{
-       va_list args;
-       static int udev_log = -1;
+static int debug;
 
-       if (udev_log == -1) {
-               const char *value;
-
-               value = getenv("UDEV_LOG");
-               if (value)
-                       udev_log = log_priority(value);
-               else
-                       udev_log = LOG_ERR;
+static void log_fn(struct udev *udev, int priority,
+                  const char *file, int line, const char *fn,
+                  const char *format, va_list args)
+{
+       if (debug) {
+               fprintf(stderr, "%s: ", fn != NULL ? fn : file);
+               vfprintf(stderr, format, args);
+       } else {
+               vsyslog(priority, format, args);
        }
-
-       if (priority > udev_log)
-               return;
-
-       va_start(args, format);
-       vsyslog(priority, format, args);
-       va_end(args);
 }
-#endif
 
 static void vid_log(int priority, const char *file, int line, const char *format, ...)
 {
-#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);
+       log_fn(NULL, priority, file, line, NULL, format, args);
        va_end(args);
-#endif
        return;
 }
 
@@ -126,6 +110,7 @@ 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' },
@@ -134,7 +119,8 @@ int main(int argc, char *argv[])
                { "export", 0, NULL, 'x' },
                { "skip-raid", 0, NULL, 's' },
                { "probe-all", 0, NULL, 'a' },
-               { "offset", 1, NULL, 'o' },
+               { "offset", 2, NULL, 'o' },
+               { "debug", 0, NULL, 'd' },
                { "help", 0, NULL, 'h' },
                {}
        };
@@ -161,7 +147,11 @@ int main(int argc, char *argv[])
        int retval;
        int rc = 0;
 
+       udev = udev_new();
+       if (udev == NULL)
+               goto exit;
        logging_init("vol_id");
+       udev_set_log_fn(udev, log_fn);
 
        /* hook in our debug into libvolume_id */
        volume_id_log_fn = vid_log;
@@ -169,11 +159,16 @@ int main(int argc, char *argv[])
        while (1) {
                int option;
 
-               option = getopt_long(argc, argv, "lLutxsaoh", options, NULL);
+               option = getopt_long(argc, argv, "lLutxsaodh", 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);
+                       break;
                case 'l':
                        print = PRINT_LABEL;
                        break;
@@ -196,18 +191,20 @@ int main(int argc, char *argv[])
                        probe_all = 1;
                        break;
                case 'o':
-                       offset = strtoull(optarg, NULL, 0);
+                       if (optarg[0] != '\0')
+                               offset = strtoull(optarg, NULL, 0);
                        break;
                case 'h':
                        printf("Usage: vol_id [options] <device>\n"
-                           " --export        export key/value pairs\n"
-                           " --type          filesystem type\n"
-                           " --label         filesystem label\n"
-                           " --label-raw     raw label\n"
-                           " --uuid          filesystem uuid\n"
-                           " --skip-raid     don't probe for raid\n"
-                           " --probe-all     find possibly conflicting signatures\n"
-                           " --offset        skip given number of bytes of input\n"
+                           " --export         export key/value pairs\n"
+                           " --type           filesystem type\n"
+                           " --label          filesystem label\n"
+                           " --label-raw      raw label\n"
+                           " --uuid           filesystem uuid\n"
+                           " --skip-raid      don't probe for raid\n"
+                           " --probe-all      find possibly conflicting signatures\n"
+                           " --offset=<bytes> probe at the given offset\n"
+                           " --debug          print debug output to stderr\n"
                            " --help\n\n");
                        goto exit;
                default:
@@ -218,7 +215,7 @@ int main(int argc, char *argv[])
 
        node = argv[optind];
        if (!node) {
-               err("no device\n");
+               err(udev, "no device\n");
                fprintf(stderr, "no device\n");
                rc = 1;
                goto exit;
@@ -239,7 +236,7 @@ int main(int argc, char *argv[])
 
        if (ioctl(fd, BLKGETSIZE64, &size) != 0)
                size = 0;
-       dbg("BLKGETSIZE64=%llu\n", (unsigned long long)size);
+       info(udev, "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) {
@@ -250,7 +247,7 @@ int main(int argc, char *argv[])
                        if (setgroups(0, NULL) != 0 ||
                            setgid(pw->pw_gid) != 0 ||
                            setuid(pw->pw_uid) != 0)
-                               info("unable to drop privileges: %s\n\n", strerror(errno));
+                               info(udev, "unable to drop privileges: %s\n\n", strerror(errno));
                }
        }
 
@@ -324,7 +321,7 @@ int main(int argc, char *argv[])
 exit:
        if (vid != NULL)
                volume_id_close(vid);
-
+       udev_unref(udev);
        logging_close();
        return rc;
 }