chiark / gitweb /
Remove src/tty-ask-password-agent
[elogind.git] / src / udev / udevadm-info.c
index f392818c8365df33842e4b4c2797ecfc22ba9d99..352e024a7c65f09d7690db98f29d915157a202a9 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
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <ctype.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#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",
@@ -44,14 +42,13 @@ static bool skip_attribute(const char *name)
         };
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(skip); i++)
-                if (strcmp(name, skip[i]) == 0)
+        for (i = 0; i < ELEMENTSOF(skip); i++)
+                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 +80,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,28 +125,23 @@ static int print_device_chain(struct udev_device *device)
         return 0;
 }
 
-static void print_record(struct udev_device *device)
-{
-        size_t len;
+static void print_record(struct udev_device *device) {
         const char *str;
         int i;
         struct udev_list_entry *list_entry;
 
         printf("P: %s\n", udev_device_get_devpath(device));
 
-        len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
         str = udev_device_get_devnode(device);
         if (str != NULL)
-                printf("N: %s\n", &str[len+1]);
+                printf("N: %s\n", str + strlen("/dev/"));
 
         i = udev_device_get_devlink_priority(device);
         if (i != 0)
                 printf("L: %i\n", i);
 
-        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) {
-                len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
-                printf("S: %s\n", &udev_list_entry_get_name(list_entry)[len+1]);
-        }
+        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device))
+                printf("S: %s\n", udev_list_entry_get_name(list_entry) + strlen("/dev/"));
 
         udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
                 printf("E: %s=%s\n",
@@ -159,8 +150,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)
@@ -169,17 +159,16 @@ static int stat_device(const char *name, bool export, const char *prefix)
         if (export) {
                 if (prefix == NULL)
                         prefix = "INFO_";
-                printf("%sMAJOR=%d\n"
-                       "%sMINOR=%d\n",
+                printf("%sMAJOR=%u\n"
+                       "%sMINOR=%u\n",
                        prefix, major(statbuf.st_dev),
                        prefix, minor(statbuf.st_dev));
         } else
-                printf("%d:%d\n", major(statbuf.st_dev), minor(statbuf.st_dev));
+                printf("%u:%u\n", major(statbuf.st_dev), minor(statbuf.st_dev));
         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;
 
@@ -200,8 +189,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)
@@ -231,198 +219,166 @@ static void cleanup_dir(DIR *dir, mode_t mask, int depth)
         }
 }
 
-static void cleanup_db(struct udev *udev)
-{
-        char filename[UTIL_PATH_SIZE];
+static void cleanup_db(struct udev *udev) {
         DIR *dir;
 
-        util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/queue.bin", NULL);
-        unlink(filename);
+        unlink("/run/udev/queue.bin");
 
-        util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/data", NULL);
-        dir = opendir(filename);
+        dir = opendir("/run/udev/data");
         if (dir != NULL) {
                 cleanup_dir(dir, S_ISVTX, 1);
                 closedir(dir);
         }
 
-        util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/links", NULL);
-        dir = opendir(filename);
+        dir = opendir("/run/udev/links");
         if (dir != NULL) {
                 cleanup_dir(dir, 0, 2);
                 closedir(dir);
         }
 
-        util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/tags", NULL);
-        dir = opendir(filename);
+        dir = opendir("/run/udev/tags");
         if (dir != NULL) {
                 cleanup_dir(dir, 0, 2);
                 closedir(dir);
         }
 
-        util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/watch", NULL);
-        dir = opendir(filename);
+        dir = opendir("/run/udev/static_node-tags");
         if (dir != NULL) {
-                cleanup_dir(dir, 0, 1);
+                cleanup_dir(dir, 0, 2);
                 closedir(dir);
         }
 
-        util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/firmware-missing", NULL);
-        dir = opendir(filename);
+        dir = opendir("/run/udev/watch");
         if (dir != NULL) {
                 cleanup_dir(dir, 0, 1);
                 closedir(dir);
         }
 }
 
-static int uinfo(struct udev *udev, int argc, char *argv[])
-{
-        struct udev_device *device = 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[]) {
+        _cleanup_udev_device_unref_ struct udev_device *device = NULL;
         bool root = 0;
         bool export = 0;
         const char *export_prefix = NULL;
-        char path[UTIL_PATH_SIZE];
         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' },
-                { "run", 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' },
                 {}
         };
 
         enum action_type {
-                ACTION_NONE,
                 ACTION_QUERY,
                 ACTION_ATTRIBUTE_WALK,
-                ACTION_ROOT,
                 ACTION_DEVICE_ID_FILE,
-        } action = ACTION_NONE;
+        } action = ACTION_QUERY;
 
         enum query_type {
-                QUERY_NONE,
                 QUERY_NAME,
                 QUERY_PATH,
                 QUERY_SYMLINK,
                 QUERY_PROPERTY,
                 QUERY_ALL,
-        } query = QUERY_NONE;
-
-        for (;;) {
-                int option;
-                struct stat statbuf;
-
-                option = getopt_long(argc, argv, "aced:n:p:q:rxP:RVh", options, NULL);
-                if (option == -1)
-                        break;
+        } query = QUERY_ALL;
 
-                switch (option) {
-                case 'n':
+        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;
                         }
-                        /* remove /dev if given */
-                        if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) != 0)
-                                util_strscpyl(name, sizeof(name), udev_get_dev_path(udev), "/", optarg, NULL);
-                        else
-                                util_strscpy(name, sizeof(name), optarg);
-                        util_remove_trailing_chars(name, '/');
-                        if (stat(name, &statbuf) < 0) {
+
+                        device = find_device(udev, optarg, "/dev/");
+                        if (device == NULL) {
                                 fprintf(stderr, "device node not found\n");
-                                rc = 2;
-                                goto exit;
-                        } else {
-                                char type;
-
-                                if (S_ISBLK(statbuf.st_mode)) {
-                                        type = 'b';
-                                } else if (S_ISCHR(statbuf.st_mode)) {
-                                        type = 'c';
-                                } else {
-                                        fprintf(stderr, "device node has wrong file type\n");
-                                        rc = 2;
-                                        goto exit;
-                                }
-                                device = udev_device_new_from_devnum(udev, type, statbuf.st_rdev);
-                                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;
                         }
-                        /* add sys dir if needed */
-                        if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0)
-                                util_strscpyl(path, sizeof(path), udev_get_sys_path(udev), optarg, NULL);
-                        else
-                                util_strscpy(path, sizeof(path), optarg);
-                        util_remove_trailing_chars(path, '/');
-                        device = udev_device_new_from_syspath(udev, path);
+
+                        device = find_device(udev, optarg, "/sys");
                         if (device == NULL) {
-                                fprintf(stderr, "device path not found\n");
-                                rc = 2;
-                                goto exit;
+                                fprintf(stderr, "syspath not found\n");
+                                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':
-                        if (action == ACTION_NONE)
-                                action = ACTION_ROOT;
                         root = true;
                         break;
-                case 'R':
-                        printf("%s\n", udev_get_run_path(udev));
-                        goto exit;
                 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;
@@ -431,39 +387,26 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
                         break;
                 case 'V':
                         printf("%s\n", VERSION);
-                        goto exit;
+                        return 0;
                 case 'h':
-                        printf("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\n");
-                        goto exit;
+                        help();
+                        return 0;
                 default:
-                        rc = 1;
-                        goto exit;
+                        return 1;
                 }
-        }
 
         switch (action) {
         case ACTION_QUERY:
-                if (device == NULL) {
-                        fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
-                        rc = 4;
-                        goto exit;
+                if (!device) {
+                        if (!argv[optind]) {
+                                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");
+                                return 4;
+                        }
                 }
 
                 switch(query) {
@@ -472,30 +415,22 @@ 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) {
+                        if (root)
                                 printf("%s\n", udev_device_get_devnode(device));
-                        } else {
-                                size_t len = strlen(udev_get_dev_path(udev));
-
-                                printf("%s\n", &udev_device_get_devnode(device)[len+1]);
-                        }
+                        else
+                                printf("%s\n", udev_device_get_devnode(device) + strlen("/dev/"));
                         break;
                 }
                 case QUERY_SYMLINK:
                         list_entry = udev_device_get_devlinks_list_entry(device);
                         while (list_entry != NULL) {
-                                if (root) {
+                                if (root)
                                         printf("%s", udev_list_entry_get_name(list_entry));
-                                } else {
-                                        size_t len;
-
-                                        len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
-                                        printf("%s", &udev_list_entry_get_name(list_entry)[len+1]);
-                                }
+                                else
+                                        printf("%s", udev_list_entry_get_name(list_entry) + strlen("/dev/"));
                                 list_entry = udev_list_entry_get_next(list_entry);
                                 if (list_entry != NULL)
                                         printf(" ");
@@ -504,7 +439,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) {
@@ -526,38 +461,34 @@ 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:
-                if (device == NULL) {
-                        fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
-                        rc = 4;
-                        goto exit;
+                if (!device && argv[optind]) {
+                        device = find_device(udev, argv[optind], NULL);
+                        if (!device) {
+                                fprintf(stderr, "Unknown device, absolute path in /dev/ or /sys expected.\n");
+                                return 4;
+                        }
+                }
+                if (!device) {
+                        fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n");
+                        return 4;
                 }
                 print_device_chain(device);
                 break;
         case ACTION_DEVICE_ID_FILE:
                 if (stat_device(name, export, export_prefix) != 0)
-                        rc = 1;
-                break;
-        case ACTION_ROOT:
-                printf("%s\n", udev_get_dev_path(udev));
-                break;
-        default:
-                fprintf(stderr, "missing option\n");
-                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",
 };