chiark / gitweb /
udevadm,..: make --help output of udev tools more like the output of the various...
[elogind.git] / src / udev / udevadm-info.c
index 907e961f4a777b62a2fc1bc8a24ca4d53c2c58b2..f52a03dfd022cda50a0afce02558b8067c53d504 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2009 Kay Sievers <kay@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
 #include <sys/types.h>
 
 #include "udev.h"
+#include "udev-util.h"
+#include "udevadm-util.h"
 
-static bool skip_attribute(const char *name)
-{
-        static const char const *skip[] = {
+static bool skip_attribute(const char *name) {
+        static const char* const skip[] = {
                 "uevent",
                 "dev",
                 "modalias",
@@ -45,13 +46,12 @@ static bool skip_attribute(const char *name)
         unsigned int i;
 
         for (i = 0; i < ELEMENTSOF(skip); i++)
-                if (strcmp(name, skip[i]) == 0)
+                if (streq(name, skip[i]))
                         return true;
         return false;
 }
 
-static void print_all_attributes(struct udev_device *device, const char *key)
-{
+static void print_all_attributes(struct udev_device *device, const char *key) {
         struct udev_list_entry *sysattr;
 
         udev_list_entry_foreach(sysattr, udev_device_get_sysattr_list_entry(device)) {
@@ -83,8 +83,7 @@ static void print_all_attributes(struct udev_device *device, const char *key)
         printf("\n");
 }
 
-static int print_device_chain(struct udev_device *device)
-{
+static int print_device_chain(struct udev_device *device) {
         struct udev_device *device_parent;
         const char *str;
 
@@ -129,8 +128,7 @@ static int print_device_chain(struct udev_device *device)
         return 0;
 }
 
-static void print_record(struct udev_device *device)
-{
+static void print_record(struct udev_device *device) {
         const char *str;
         int i;
         struct udev_list_entry *list_entry;
@@ -155,8 +153,7 @@ static void print_record(struct udev_device *device)
         printf("\n");
 }
 
-static int stat_device(const char *name, bool export, const char *prefix)
-{
+static int stat_device(const char *name, bool export, const char *prefix) {
         struct stat statbuf;
 
         if (stat(name, &statbuf) != 0)
@@ -174,8 +171,7 @@ static int stat_device(const char *name, bool export, const char *prefix)
         return 0;
 }
 
-static int export_devices(struct udev *udev)
-{
+static int export_devices(struct udev *udev) {
         struct udev_enumerate *udev_enumerate;
         struct udev_list_entry *list_entry;
 
@@ -196,8 +192,7 @@ static int export_devices(struct udev *udev)
         return 0;
 }
 
-static void cleanup_dir(DIR *dir, mode_t mask, int depth)
-{
+static void cleanup_dir(DIR *dir, mode_t mask, int depth) {
         struct dirent *dent;
 
         if (depth <= 0)
@@ -227,8 +222,7 @@ static void cleanup_dir(DIR *dir, mode_t mask, int depth)
         }
 }
 
-static void cleanup_db(struct udev *udev)
-{
+static void cleanup_db(struct udev *udev) {
         DIR *dir;
 
         unlink("/run/udev/queue.bin");
@@ -251,95 +245,69 @@ static void cleanup_db(struct udev *udev)
                 closedir(dir);
         }
 
-        dir = opendir("/run/udev/watch");
+        dir = opendir("/run/udev/static_node-tags");
         if (dir != NULL) {
-                cleanup_dir(dir, 0, 1);
+                cleanup_dir(dir, 0, 2);
                 closedir(dir);
         }
 
-        dir = opendir("/run/udev/firmware-missing");
+        dir = opendir("/run/udev/watch");
         if (dir != NULL) {
                 cleanup_dir(dir, 0, 1);
                 closedir(dir);
         }
 }
 
-static struct udev_device *find_device(struct udev *udev, const char *id, const char *prefix)
-{
-        char name[UTIL_PATH_SIZE];
-
-        if (prefix && !startswith(id, prefix)) {
-                util_strscpyl(name, sizeof(name), prefix, id, NULL);
-                id = name;
-        }
-
-        if (startswith(id, "/dev/")) {
-                struct stat statbuf;
-                char type;
-
-                if (stat(id, &statbuf) < 0)
-                        return NULL;
-
-                if (S_ISBLK(statbuf.st_mode))
-                        type = 'b';
-                else if (S_ISCHR(statbuf.st_mode))
-                        type = 'c';
-                else
-                        return NULL;
-
-                return udev_device_new_from_devnum(udev, type, statbuf.st_rdev);
-        } else if (startswith(id, "/sys/"))
-                return udev_device_new_from_syspath(udev, id);
-        else
-                return NULL;
+static void help(void) {
+
+        printf("%s info [OPTIONS] [DEVPATH|FILE]\n\n"
+               "Query sysfs or the udev database.\n\n"
+               "  -h --help                   Print this message\n"
+               "     --version                Print version of the program\n"
+               "  -q --query=TYPE             Query device information:\n"
+               "       name                     Name of device node\n"
+               "       symlink                  Pointing to node\n"
+               "       path                     sysfs device path\n"
+               "       property                 The device properties\n"
+               "       all                      All values\n"
+               "  -p --path=SYSPATH           sysfs device path used for query or attribute walk\n"
+               "  -n --name=NAME              Node or symlink name used for query or attribute walk\n"
+               "  -r --root                   Prepend dev directory to path names\n"
+               "  -a --attribute-walk         Print all key matches walking along the chain\n"
+               "                              of parent devices\n"
+               "  -d --device-id-of-file=FILE Print major:minor of device containing this file\n"
+               "  -x --export                 Export key/value pairs\n"
+               "  -P --export-prefix          Export the key name with a prefix\n"
+               "  -e --export-db              Export the content of the udev database\n"
+               "  -c --cleanup-db             Clean up the udev database\n"
+               , program_invocation_short_name);
 }
 
-static int uinfo(struct udev *udev, int argc, char *argv[])
-{
-        struct udev_device *device = NULL;
+static int uinfo(struct udev *udev, int argc, char *argv[]) {
+        _cleanup_udev_device_unref_ struct udev_device *device = NULL;
         bool root = 0;
         bool export = 0;
         const char *export_prefix = NULL;
         char name[UTIL_PATH_SIZE];
         struct udev_list_entry *list_entry;
-        int rc = 0;
+        int c;
 
         static const struct option options[] = {
-                { "name", required_argument, NULL, 'n' },
-                { "path", required_argument, NULL, 'p' },
-                { "query", required_argument, NULL, 'q' },
-                { "attribute-walk", no_argument, NULL, 'a' },
-                { "cleanup-db", no_argument, NULL, 'c' },
-                { "export-db", no_argument, NULL, 'e' },
-                { "root", no_argument, NULL, 'r' },
+                { "name",              required_argument, NULL, 'n' },
+                { "path",              required_argument, NULL, 'p' },
+                { "query",             required_argument, NULL, 'q' },
+                { "attribute-walk",    no_argument,       NULL, 'a' },
+                { "cleanup-db",        no_argument,       NULL, 'c' },
+                { "export-db",         no_argument,       NULL, 'e' },
+                { "root",              no_argument,       NULL, 'r' },
                 { "device-id-of-file", required_argument, NULL, 'd' },
-                { "export", no_argument, NULL, 'x' },
-                { "export-prefix", required_argument, NULL, 'P' },
-                { "version", no_argument, NULL, 'V' },
-                { "help", no_argument, NULL, 'h' },
+                { "export",            no_argument,       NULL, 'x' },
+                { "export-prefix",     required_argument, NULL, 'P' },
+                { "version",           no_argument,       NULL, 'V' },
+                { "help",              no_argument,       NULL, 'h' },
                 {}
         };
 
-        static const char *usage =
-                "Usage: udevadm info OPTIONS\n"
-                "  --query=<type>             query device information:\n"
-                "      name                     name of device node\n"
-                "      symlink                  pointing to node\n"
-                "      path                     sys device path\n"
-                "      property                 the device properties\n"
-                "      all                      all values\n"
-                "  --path=<syspath>           sys device path used for query or attribute walk\n"
-                "  --name=<name>              node or symlink name used for query or attribute walk\n"
-                "  --root                     prepend dev directory to path names\n"
-                "  --attribute-walk           print all key matches while walking along the chain\n"
-                "                             of parent devices\n"
-                "  --device-id-of-file=<file> print major:minor of device containing this file\n"
-                "  --export                   export key/value pairs\n"
-                "  --export-prefix            export the key name with a prefix\n"
-                "  --export-db                export the content of the udev database\n"
-                "  --cleanup-db               cleanup the udev database\n"
-                "  --help\n";
-
         enum action_type {
                 ACTION_QUERY,
                 ACTION_ATTRIBUTE_WALK,
@@ -354,59 +322,48 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
                 QUERY_ALL,
         } query = QUERY_ALL;
 
-        for (;;) {
-                int option;
-
-                option = getopt_long(argc, argv, "aced:n:p:q:rxP:RVh", options, NULL);
-                if (option == -1)
-                        break;
-
-                switch (option) {
+        while ((c = getopt_long(argc, argv, "aced:n:p:q:rxP:RVh", options, NULL)) >= 0)
+                switch (c) {
                 case 'n': {
                         if (device != NULL) {
                                 fprintf(stderr, "device already specified\n");
-                                rc = 2;
-                                goto exit;
+                                return 2;
                         }
 
                         device = find_device(udev, optarg, "/dev/");
                         if (device == NULL) {
                                 fprintf(stderr, "device node not found\n");
-                                rc = 2;
-                                goto exit;
+                                return 2;
                         }
                         break;
                 }
                 case 'p':
                         if (device != NULL) {
                                 fprintf(stderr, "device already specified\n");
-                                rc = 2;
-                                goto exit;
+                                return 2;
                         }
 
                         device = find_device(udev, optarg, "/sys");
                         if (device == NULL) {
                                 fprintf(stderr, "syspath not found\n");
-                                rc = 2;
-                                goto exit;
+                                return 2;
                         }
                         break;
                 case 'q':
                         action = ACTION_QUERY;
-                        if (strcmp(optarg, "property") == 0 || strcmp(optarg, "env") == 0) {
+                        if (streq(optarg, "property") || streq(optarg, "env"))
                                 query = QUERY_PROPERTY;
-                        } else if (strcmp(optarg, "name") == 0) {
+                        else if (streq(optarg, "name"))
                                 query = QUERY_NAME;
-                        } else if (strcmp(optarg, "symlink") == 0) {
+                        else if (streq(optarg, "symlink"))
                                 query = QUERY_SYMLINK;
-                        } else if (strcmp(optarg, "path") == 0) {
+                        else if (streq(optarg, "path"))
                                 query = QUERY_PATH;
-                        } else if (strcmp(optarg, "all") == 0) {
+                        else if (streq(optarg, "all"))
                                 query = QUERY_ALL;
-                        else {
+                        else {
                                 fprintf(stderr, "unknown query type\n");
-                                rc = 3;
-                                goto exit;
+                                return 3;
                         }
                         break;
                 case 'r':
@@ -414,17 +371,17 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
                         break;
                 case 'd':
                         action = ACTION_DEVICE_ID_FILE;
-                        util_strscpy(name, sizeof(name), optarg);
+                        strscpy(name, sizeof(name), optarg);
                         break;
                 case 'a':
                         action = ACTION_ATTRIBUTE_WALK;
                         break;
                 case 'e':
                         export_devices(udev);
-                        goto exit;
+                        return 0;
                 case 'c':
                         cleanup_db(udev);
-                        goto exit;
+                        return 0;
                 case 'x':
                         export = true;
                         break;
@@ -433,29 +390,25 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
                         break;
                 case 'V':
                         printf("%s\n", VERSION);
-                        goto exit;
+                        return 0;
                 case 'h':
-                        printf("%s\n", usage);
-                        goto exit;
+                        help();
+                        return 0;
                 default:
-                        rc = 1;
-                        goto exit;
+                        return 1;
                 }
-        }
 
         switch (action) {
         case ACTION_QUERY:
                 if (!device) {
                         if (!argv[optind]) {
-                                fprintf(stderr, "%s\n", usage);
-                                rc = 2;
-                                goto exit;
+                                help();
+                                return 2;
                         }
                         device = find_device(udev, argv[optind], NULL);
                         if (!device) {
                                 fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n");
-                                rc = 4;
-                                goto exit;
+                                return 4;
                         }
                 }
 
@@ -465,8 +418,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
 
                         if (node == NULL) {
                                 fprintf(stderr, "no device node found\n");
-                                rc = 5;
-                                goto exit;
+                                return 5;
                         }
 
                         if (root)
@@ -490,7 +442,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
                         break;
                 case QUERY_PATH:
                         printf("%s\n", udev_device_get_devpath(device));
-                        goto exit;
+                        return 0;
                 case QUERY_PROPERTY:
                         list_entry = udev_device_get_properties_list_entry(device);
                         while (list_entry != NULL) {
@@ -512,8 +464,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
                         print_record(device);
                         break;
                 default:
-                        fprintf(stderr, "unknown query type\n");
-                        break;
+                        assert_not_reached("unknown query type");
                 }
                 break;
         case ACTION_ATTRIBUTE_WALK:
@@ -521,30 +472,26 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
                         device = find_device(udev, argv[optind], NULL);
                         if (!device) {
                                 fprintf(stderr, "Unknown device, absolute path in /dev/ or /sys expected.\n");
-                                rc = 4;
-                                goto exit;
+                                return 4;
                         }
                 }
                 if (!device) {
                         fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n");
-                        rc = 4;
-                        goto exit;
+                        return 4;
                 }
                 print_device_chain(device);
                 break;
         case ACTION_DEVICE_ID_FILE:
                 if (stat_device(name, export, export_prefix) != 0)
-                        rc = 1;
+                        return 1;
                 break;
         }
 
-exit:
-        udev_device_unref(device);
-        return rc;
+        return 0;
 }
 
 const struct udevadm_cmd udevadm_info = {
         .name = "info",
         .cmd = uinfo,
-        .help = "query sysfs or the udev database",
+        .help = "Query sysfs or the udev database",
 };