Also merge into the top-level Makefile.am the simpler extras.

[elogind.git] / udev / udevadm-info.c

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 094c6ce2a8da64e637758d8ecc0c26d4d57e56e9..519dc4a45bf586fe27d96cacfe72c3fc98f0201d 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2009 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
@@ -25,6 +25,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -40,7 +41,6 @@ static void print_all_attributes(struct udev_device *device, const char *key)
        if (dir != NULL) {
                for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
                        struct stat statbuf;
-                       char filename[UTIL_PATH_SIZE];
                        const char *value;
                        size_t len;
 
@@ -52,10 +52,7 @@ static void print_all_attributes(struct udev_device *device, const char *key)
                        if (strcmp(dent->d_name, "dev") == 0)
                                continue;
 
-                       util_strlcpy(filename, udev_device_get_syspath(device), sizeof(filename));
-                       util_strlcat(filename, "/", sizeof(filename));
-                       util_strlcat(filename, dent->d_name, sizeof(filename));
-                       if (lstat(filename, &statbuf) != 0)
+                       if (fstatat(dirfd(dir), dent->d_name, &statbuf, AT_SYMLINK_NOFOLLOW) != 0)
                                continue;
                        if (S_ISLNK(statbuf.st_mode))
                                continue;
@@ -147,15 +144,15 @@ static void print_record(struct udev_device *device)
 
        i = udev_device_get_num_fake_partitions(device);
        if (i != 0)
-               printf("A:%u\n", i);
+               printf("A: %u\n", i);
 
        i = udev_device_get_ignore_remove(device);
        if (i != 0)
-               printf("R:%u\n", i);
+               printf("R: %u\n", i);
 
        i = udev_device_get_watch_handle(device);
        if (i >= 0)
-               printf("W:%u\n", i);
+               printf("W: %u\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)));
@@ -202,8 +199,7 @@ static int export_devices(struct udev *udev)
 
                device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
                if (device != NULL) {
-                       if (udev_device_get_devnode(device) != NULL)
-                               print_record(device);
+                       print_record(device);
                        udev_device_unref(device);
                }
        }
@@ -250,7 +246,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                QUERY_NAME,
                QUERY_PATH,
                QUERY_SYMLINK,
-               QUERY_ENV,
+               QUERY_PROPERTY,
                QUERY_ALL,
        } query = QUERY_NONE;
 
@@ -271,13 +267,10 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                                goto exit;
                        }
                        /* remove /dev if given */
-                       if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) != 0) {
-                               util_strlcpy(name, udev_get_dev_path(udev), sizeof(name));
-                               util_strlcat(name, "/", sizeof(name));
-                               util_strlcat(name, optarg, sizeof(name));
-                       } else {
-                               util_strlcpy(name, optarg, sizeof(name));
-                       }
+                       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) {
                                fprintf(stderr, "device node not found\n");
@@ -310,12 +303,10 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                                goto exit;
                        }
                        /* add sys dir if needed */
-                       if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
-                               util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-                               util_strlcat(path, optarg, sizeof(path));
-                       } else {
-                               util_strlcpy(path, optarg, sizeof(path));
-                       }
+                       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);
                        if (device == NULL) {
@@ -326,29 +317,22 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                        break;
                case 'q':
                        action = ACTION_QUERY;
-                       if (strcmp(optarg, "name") == 0) {
+                       if (strcmp(optarg, "property") == 0 || strcmp(optarg, "env") == 0) {
+                               query = QUERY_PROPERTY;
+                       } else if (strcmp(optarg, "name") == 0) {
                                query = QUERY_NAME;
-                               break;
-                       }
-                       if (strcmp(optarg, "symlink") == 0) {
+                       } else if (strcmp(optarg, "symlink") == 0) {
                                query = QUERY_SYMLINK;
-                               break;
-                       }
-                       if (strcmp(optarg, "path") == 0) {
+                       } else if (strcmp(optarg, "path") == 0) {
                                query = QUERY_PATH;
-                               break;
-                       }
-                       if (strcmp(optarg, "env") == 0) {
-                               query = QUERY_ENV;
-                               break;
-                       }
-                       if (strcmp(optarg, "all") == 0) {
+                       } else if (strcmp(optarg, "all") == 0) {
                                query = QUERY_ALL;
-                               break;
+                       } else {
+                               fprintf(stderr, "unknown query type\n");
+                               rc = 3;
+                               goto exit;
                        }
-                       fprintf(stderr, "unknown query type\n");
-                       rc = 3;
-                       goto exit;
+                       break;
                case 'r':
                        if (action == ACTION_NONE)
                                action = ACTION_ROOT;
@@ -356,7 +340,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                        break;
                case 'd':
                        action = ACTION_DEVICE_ID_FILE;
-                       util_strlcpy(name, optarg, sizeof(name));
+                       util_strscpy(name, sizeof(name), optarg);
                        break;
                case 'a':
                        action = ACTION_ATTRIBUTE_WALK;
@@ -379,7 +363,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                               "      name                     name of device node\n"
                               "      symlink                  pointing to node\n"
                               "      path                     sys device path\n"
-                              "      env                      the device related imported environment\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"
@@ -388,8 +372,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                               "                             of parent devices\n"
                               "  --device-id-of-file=<file> print major:minor of device containing this file\n"
                               "  --export-db                export the content of the udev database\n"
-                              "  --help                     print this text\n"
-                              "\n");
+                              "  --help\n\n");
                        goto exit;
                default:
                        goto exit;
@@ -442,7 +425,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                case QUERY_PATH:
                        printf("%s\n", udev_device_get_devpath(device));
                        goto exit;
-               case QUERY_ENV:
+               case QUERY_PROPERTY:
                        list_entry = udev_device_get_properties_list_entry(device);
                        while (list_entry != NULL) {
                                printf("%s=%s\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));