chiark / gitweb /
Docs: udev.xml: Offset daemon name with commas
[elogind.git] / udev / udevadm-info.c
index b54b61e084eff27c962474805adf8922879f4ac3..9357f672083e86a36fc22b160d487c3b72a9f706 100644 (file)
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2004-2006 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 the
- *     Free Software Foundation version 2 of the License.
- * 
- *     This program is distributed in the hope that it will be useful, but
- *     WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *     General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License along
- *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 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 Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include "udev.h"
 
-static void print_all_attributes(struct udev *udev, const char *devpath, const char *key)
+static bool skip_attribute(const char *name)
 {
-       char path[PATH_SIZE];
-       DIR *dir;
-       struct dirent *dent;
-
-       strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-       strlcat(path, devpath, sizeof(path));
-
-       dir = opendir(path);
-       if (dir != NULL) {
-               for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-                       struct stat statbuf;
-                       char filename[PATH_SIZE];
-                       char *attr_value;
-                       char value[NAME_SIZE];
-                       size_t len;
-
-                       if (dent->d_name[0] == '.')
-                               continue;
-
-                       if (strcmp(dent->d_name, "uevent") == 0)
-                               continue;
-                       if (strcmp(dent->d_name, "dev") == 0)
-                               continue;
-
-                       strlcpy(filename, path, sizeof(filename));
-                       strlcat(filename, "/", sizeof(filename));
-                       strlcat(filename, dent->d_name, sizeof(filename));
-                       if (lstat(filename, &statbuf) != 0)
-                               continue;
-                       if (S_ISLNK(statbuf.st_mode))
-                               continue;
-
-                       attr_value = sysfs_attr_get_value(udev, devpath, dent->d_name);
-                       if (attr_value == NULL)
-                               continue;
-                       len = strlcpy(value, attr_value, sizeof(value));
-                       if(len >= sizeof(value))
-                               len = sizeof(value) - 1;
-                       dbg(udev, "attr '%s'='%s'(%zi)\n", dent->d_name, value, len);
-
-                       /* remove trailing newlines */
-                       while (len && value[len-1] == '\n')
-                               value[--len] = '\0';
-
-                       /* skip nonprintable attributes */
-                       while (len && isprint(value[len-1]))
-                               len--;
-                       if (len) {
-                               dbg(udev, "attribute value of '%s' non-printable, skip\n", dent->d_name);
-                               continue;
-                       }
+       static const char const *skip[] = {
+               "uevent",
+               "dev",
+               "modalias",
+               "resource",
+               "driver",
+               "subsystem",
+               "module",
+       };
+       unsigned int i;
 
-                       printf("    %s{%s}==\"%s\"\n", key, dent->d_name, value);
+       for (i = 0; i < ARRAY_SIZE(skip); i++)
+               if (strcmp(name, skip[i]) == 0)
+                       return true;
+       return false;
+}
+
+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)) {
+               struct udev *udev = udev_device_get_udev(device);
+               const char *name;
+               const char *value;
+               size_t len;
+
+               name = udev_list_entry_get_name(sysattr);
+               if (skip_attribute(name))
+                       continue;
+
+               value = udev_device_get_sysattr_value(device, name);
+               if (value == NULL)
+                       continue;
+               dbg(udev, "attr '%s'='%s'\n", name, value);
+
+               /* skip nonprintable attributes */
+               len = strlen(value);
+               while (len > 0 && isprint(value[len-1]))
+                       len--;
+               if (len > 0) {
+                       dbg(udev, "attribute value of '%s' non-printable, skip\n", name);
+                       continue;
                }
+
+               printf("    %s{%s}==\"%s\"\n", key, name, value);
        }
        printf("\n");
 }
 
-static int print_device_chain(struct udev *udev, const char *devpath)
+static int print_device_chain(struct udev_device *device)
 {
-       struct sysfs_device *dev;
-
-       dev = sysfs_device_get(udev, devpath);
-       if (dev == NULL)
-               return -1;
+       struct udev_device *device_parent;
+       const char *str;
 
        printf("\n"
-              "Udevinfo starts with the device specified by the devpath and then\n"
+              "Udevadm info starts with the device specified by the devpath and then\n"
               "walks up the chain of parent devices. It prints for every device\n"
               "found, all possible attributes in the udev rules key format.\n"
               "A rule to match, can be composed by the attributes of the device\n"
               "and the attributes from one single parent device.\n"
               "\n");
 
-       printf("  looking at device '%s':\n", dev->devpath);
-       printf("    KERNEL==\"%s\"\n", dev->kernel);
-       printf("    SUBSYSTEM==\"%s\"\n", dev->subsystem);
-       printf("    DRIVER==\"%s\"\n", dev->driver);
-       print_all_attributes(udev, dev->devpath, "ATTR");
-
-       /* walk up the chain of devices */
-       while (1) {
-               dev = sysfs_device_get_parent(udev, dev);
-               if (dev == NULL)
+       printf("  looking at device '%s':\n", udev_device_get_devpath(device));
+       printf("    KERNEL==\"%s\"\n", udev_device_get_sysname(device));
+       str = udev_device_get_subsystem(device);
+       if (str == NULL)
+               str = "";
+       printf("    SUBSYSTEM==\"%s\"\n", str);
+       str = udev_device_get_driver(device);
+       if (str == NULL)
+               str = "";
+       printf("    DRIVER==\"%s\"\n", str);
+       print_all_attributes(device, "ATTR");
+
+       device_parent = device;
+       do {
+               device_parent = udev_device_get_parent(device_parent);
+               if (device_parent == NULL)
                        break;
-               printf("  looking at parent device '%s':\n", dev->devpath);
-               printf("    KERNELS==\"%s\"\n", dev->kernel);
-               printf("    SUBSYSTEMS==\"%s\"\n", dev->subsystem);
-               printf("    DRIVERS==\"%s\"\n", dev->driver);
-
-               print_all_attributes(udev, dev->devpath, "ATTRS");
-       }
+               printf("  looking at parent device '%s':\n", udev_device_get_devpath(device_parent));
+               printf("    KERNELS==\"%s\"\n", udev_device_get_sysname(device_parent));
+               str = udev_device_get_subsystem(device_parent);
+               if (str == NULL)
+                       str = "";
+               printf("    SUBSYSTEMS==\"%s\"\n", str);
+               str = udev_device_get_driver(device_parent);
+               if (str == NULL)
+                       str = "";
+               printf("    DRIVERS==\"%s\"\n", str);
+               print_all_attributes(device_parent, "ATTRS");
+       } while (device_parent != NULL);
 
        return 0;
 }
 
-static void print_record(struct udevice *udevice)
-{
-       struct name_entry *name_loop;
-
-       printf("P: %s\n", udevice->dev->devpath);
-       printf("N: %s\n", udevice->name);
-       list_for_each_entry(name_loop, &udevice->symlink_list, node)
-               printf("S: %s\n", name_loop->name);
-       if (udevice->link_priority != 0)
-               printf("L: %i\n", udevice->link_priority);
-       if (udevice->partitions != 0)
-               printf("A:%u\n", udevice->partitions);
-       if (udevice->ignore_remove)
-               printf("R:%u\n", udevice->ignore_remove);
-       list_for_each_entry(name_loop, &udevice->env_list, node)
-               printf("E: %s\n", name_loop->name);
-}
-
-static void export_db(struct udev *udev)
-{
-       LIST_HEAD(name_list);
-       struct name_entry *name_loop;
-
-       udev_db_get_all_entries(udev, &name_list);
-       list_for_each_entry(name_loop, &name_list, node) {
-               struct udevice *udevice_db;
-
-               udevice_db = udev_device_init(udev);
-               if (udevice_db == NULL)
-                       continue;
-               if (udev_db_get_device(udevice_db, name_loop->name) == 0)
-                       print_record(udevice_db);
-                       printf("\n");
-               udev_device_cleanup(udevice_db);
-       }
-       name_list_cleanup(udev, &name_list);
-}
-
-static int lookup_device_by_name(struct udev *udev, struct udevice **udevice, const char *name)
+static void print_record(struct udev_device *device)
 {
-       LIST_HEAD(name_list);
-       int count;
-       struct name_entry *device;
-       int rc  = -1;
+       size_t len;
+       const char *str;
+       int i;
+       struct udev_list_entry *list_entry;
 
-       count = udev_db_get_devices_by_name(udev, name, &name_list);
-       if (count <= 0)
-               goto out;
+       printf("P: %s\n", udev_device_get_devpath(device));
 
-       info(udev, "found %i devices for '%s'\n", count, name);
+       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]);
 
-       /* select the device that seems to match */
-       list_for_each_entry(device, &name_list, node) {
-               struct udevice *udevice_loop;
-               char filename[PATH_SIZE];
-               struct stat statbuf;
+       i = udev_device_get_devlink_priority(device);
+       if (i != 0)
+               printf("L: %i\n", i);
 
-               udevice_loop = udev_device_init(udev);
-               if (udevice_loop == NULL)
-                       break;
-               if (udev_db_get_device(udevice_loop, device->name) != 0)
-                       goto next;
-               info(udev, "found db entry '%s'\n", device->name);
-
-               /* make sure, we don't get a link of a different device */
-               strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
-               strlcat(filename, "/", sizeof(filename));
-               strlcat(filename, name, sizeof(filename));
-               if (stat(filename, &statbuf) != 0)
-                       goto next;
-               if (major(udevice_loop->devt) > 0 && udevice_loop->devt != statbuf.st_rdev) {
-                       info(udev, "skip '%s', dev_t doesn't match\n", udevice_loop->name);
-                       goto next;
-               }
-               rc = 0;
-               *udevice = udevice_loop;
-               break;
-next:
-               udev_device_cleanup(udevice_loop);
+       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]);
        }
-out:
-       name_list_cleanup(udev, &name_list);
-       return rc;
+
+       udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
+               printf("E: %s=%s\n",
+                      udev_list_entry_get_name(list_entry),
+                      udev_list_entry_get_value(list_entry));
+       printf("\n");
 }
 
-static int stat_device(const char *name, int export, const char *prefix)
+static int stat_device(const char *name, bool export, const char *prefix)
 {
        struct stat statbuf;
 
@@ -235,25 +178,52 @@ static int stat_device(const char *name, int export, const char *prefix)
        return 0;
 }
 
+static int export_devices(struct udev *udev)
+{
+       struct udev_enumerate *udev_enumerate;
+       struct udev_list_entry *list_entry;
+
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
+               return -1;
+       udev_enumerate_scan_devices(udev_enumerate);
+       udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) {
+               struct udev_device *device;
+
+               device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
+               if (device != NULL) {
+                       print_record(device);
+                       udev_device_unref(device);
+               }
+       }
+       udev_enumerate_unref(udev_enumerate);
+       return 0;
+}
+
 int udevadm_info(struct udev *udev, int argc, char *argv[])
 {
-       struct udevice *udevice = NULL;
-       int root = 0;
-       int export = 0;
+       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;
 
        static const struct option options[] = {
-               { "name", 1, NULL, 'n' },
-               { "path", 1, NULL, 'p' },
-               { "query", 1, NULL, 'q' },
-               { "attribute-walk", 0, NULL, 'a' },
-               { "export-db", 0, NULL, 'e' },
-               { "root", 0, NULL, 'r' },
-               { "device-id-of-file", 1, NULL, 'd' },
-               { "export", 0, NULL, 'x' },
-               { "export-prefix", 1, NULL, 'P' },
-               { "version", 0, NULL, 1 }, /* -V outputs braindead format */
-               { "help", 0, NULL, 'h' },
+               { "name", required_argument, NULL, 'n' },
+               { "path", required_argument, NULL, 'p' },
+               { "query", required_argument, NULL, 'q' },
+               { "attribute-walk", no_argument, NULL, 'a' },
+               { "export-db", no_argument, NULL, 'e' },
+               { "root", no_argument, NULL, 'r' },
+               { "run", 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' },
                {}
        };
 
@@ -270,190 +240,210 @@ 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;
 
-       char path[PATH_SIZE] = "";
-       char name[PATH_SIZE] = "";
-       struct name_entry *name_loop;
-       int rc = 0;
-
-       while (1) {
+       for (;;) {
                int option;
+               struct stat statbuf;
 
-               option = getopt_long(argc, argv, "aed:n:p:q:rxPVh", options, NULL);
+               option = getopt_long(argc, argv, "aed:n:p:q:rxP:RVh", options, NULL);
                if (option == -1)
                        break;
 
                dbg(udev, "option '%c'\n", option);
                switch (option) {
                case 'n':
+                       if (device != NULL) {
+                               fprintf(stderr, "device already specified\n");
+                               rc = 2;
+                               goto exit;
+                       }
                        /* remove /dev if given */
-                       if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) == 0)
-                               strlcpy(name, &optarg[strlen(udev_get_dev_path(udev))+1], 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
-                               strlcpy(name, optarg, sizeof(name));
-                       remove_trailing_chars(name, '/');
-                       dbg(udev, "name: %s\n", name);
+                               util_strscpy(name, sizeof(name), optarg);
+                       util_remove_trailing_chars(name, '/');
+                       if (stat(name, &statbuf) < 0) {
+                               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;
+                               }
+                       }
                        break;
                case 'p':
-                       /* remove /sys if given */
-                       if (strncmp(optarg, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) == 0)
-                               strlcpy(path, &optarg[strlen(udev_get_sys_path(udev))], sizeof(path));
+                       if (device != NULL) {
+                               fprintf(stderr, "device already specified\n");
+                               rc = 2;
+                               goto exit;
+                       }
+                       /* 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
-                               strlcpy(path, optarg, sizeof(path));
-                       remove_trailing_chars(path, '/');
-
-                       /* possibly resolve to real devpath */
-                       if (sysfs_resolve_link(udev, path, sizeof(path)) != 0) {
-                               char temp[PATH_SIZE];
-                               char *pos;
-
-                               /* also check if the parent is a link */
-                               strlcpy(temp, path, sizeof(temp));
-                               pos = strrchr(temp, '/');
-                               if (pos != 0) {
-                                       char tail[PATH_SIZE];
-
-                                       strlcpy(tail, pos, sizeof(tail));
-                                       pos[0] = '\0';
-                                       if (sysfs_resolve_link(udev, temp, sizeof(temp)) == 0) {
-                                               strlcpy(path, temp, sizeof(path));
-                                               strlcat(path, tail, sizeof(path));
-                                       }
-                               }
+                               util_strscpy(path, sizeof(path), optarg);
+                       util_remove_trailing_chars(path, '/');
+                       device = udev_device_new_from_syspath(udev, path);
+                       if (device == NULL) {
+                               fprintf(stderr, "device path not found\n");
+                               rc = 2;
+                               goto exit;
                        }
-                       dbg(udev, "path: %s\n", path);
                        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 = 2;
-                       goto exit;
+                       break;
                case 'r':
                        if (action == ACTION_NONE)
                                action = ACTION_ROOT;
-                       root = 1;
+                       root = true;
                        break;
+               case 'R':
+                       printf("%s\n", udev_get_run_path(udev));
+                       goto exit;
                case 'd':
                        action = ACTION_DEVICE_ID_FILE;
-                       strlcpy(name, optarg, sizeof(name));
+                       util_strscpy(name, sizeof(name), optarg);
                        break;
                case 'a':
                        action = ACTION_ATTRIBUTE_WALK;
                        break;
                case 'e':
-                       export_db(udev);
+                       export_devices(udev);
                        goto exit;
                case 'x':
-                       export = 1;
+                       export = true;
                        break;
                case 'P':
                        export_prefix = optarg;
                        break;
-               case 1:
-                       printf("%s\n", VERSION);
-                       goto exit;
                case 'V':
-                       printf("udevinfo, version %s\n", VERSION);
+                       printf("%s\n", VERSION);
                        goto exit;
                case 'h':
                        printf("Usage: udevadm info OPTIONS\n"
-                              "  --query=<type>             query database for the specified value:\n"
+                              "  --query=<type>             query device information:\n"
                               "      name                     name of device node\n"
                               "      symlink                  pointing to node\n"
-                              "      path                     sysfs device path\n"
-                              "      env                      the device related imported environment\n"
+                              "      path                     sys device path\n"
+                              "      property                 the device properties\n"
                               "      all                      all values\n"
-                              "  --path=<devpath>           sysfs device path used for query or chain\n"
-                              "  --name=<name>              node or symlink name used for query\n"
-                              "  --root                     prepend to query result or print udev_root\n"
-                              "  --attribute-walk           print all key matches while walking along chain\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 underlying device\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"
-                              "  --help                     print this text\n"
-                              "\n");
+                              "  --help\n\n");
                        goto exit;
                default:
                        goto exit;
                }
        }
 
-       /* run action */
        switch (action) {
        case ACTION_QUERY:
-               /* needs devpath or node/symlink name for query */
-               if (path[0] != '\0') {
-                       udevice = udev_device_init(udev);
-                       if (udevice == NULL) {
-                               rc = 1;
-                               goto exit;
-                       }
-                       if (udev_db_get_device(udevice, path) != 0) {
-                               fprintf(stderr, "no record for '%s' in database\n", path);
-                               rc = 3;
-                               goto exit;
-                       }
-               } else if (name[0] != '\0') {
-                       if (lookup_device_by_name(udev, &udevice, name) != 0) {
-                               fprintf(stderr, "node name not found\n");
-                               rc = 4;
-                               goto exit;
-                       }
-               } else {
-                       fprintf(stderr, "query needs --path or node --name specified\n");
+               if (device == NULL) {
+                       fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
                        rc = 4;
                        goto exit;
                }
 
                switch(query) {
-               case QUERY_NAME:
-                       if (root)
-                               printf("%s/%s\n", udev_get_dev_path(udev), udevice->name);
-                       else
-                               printf("%s\n", udevice->name);
+               case QUERY_NAME: {
+                       const char *node = udev_device_get_devnode(device);
+
+                       if (node == NULL) {
+                               fprintf(stderr, "no device node found\n");
+                               rc = 5;
+                               goto exit;
+                       }
+
+                       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]);
+                       }
                        break;
+               }
                case QUERY_SYMLINK:
-                       list_for_each_entry(name_loop, &udevice->symlink_list, node) {
-                               char c = name_loop->node.next != &udevice->symlink_list ? ' ' : '\n';
-
-                               if (root)
-                                       printf("%s/%s%c", udev_get_dev_path(udev), name_loop->name, c);
-                               else
-                                       printf("%s%c", name_loop->name, c);
+                       list_entry = udev_device_get_devlinks_list_entry(device);
+                       while (list_entry != NULL) {
+                               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]);
+                               }
+                               list_entry = udev_list_entry_get_next(list_entry);
+                               if (list_entry != NULL)
+                                       printf(" ");
                        }
+                       printf("\n");
                        break;
                case QUERY_PATH:
-                       printf("%s\n", udevice->dev->devpath);
+                       printf("%s\n", udev_device_get_devpath(device));
                        goto exit;
-               case QUERY_ENV:
-                       list_for_each_entry(name_loop, &udevice->env_list, node)
-                               printf("%s\n", name_loop->name);
+               case QUERY_PROPERTY:
+                       list_entry = udev_device_get_properties_list_entry(device);
+                       while (list_entry != NULL) {
+                               if (export) {
+                                       const char *prefix = export_prefix;
+
+                                       if (prefix == NULL)
+                                               prefix = "";
+                                       printf("%s%s='%s'\n", prefix,
+                                              udev_list_entry_get_name(list_entry),
+                                              udev_list_entry_get_value(list_entry));
+                               } else {
+                                       printf("%s=%s\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
+                               }
+                               list_entry = udev_list_entry_get_next(list_entry);
+                       }
                        break;
                case QUERY_ALL:
-                       print_record(udevice);
+                       print_record(device);
                        break;
                default:
                        fprintf(stderr, "unknown query type\n");
@@ -461,32 +451,16 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                }
                break;
        case ACTION_ATTRIBUTE_WALK:
-               if (path[0] != '\0') {
-                       if (print_device_chain(udev, path) != 0) {
-                               fprintf(stderr, "no valid sysfs device found\n");
-                               rc = 4;
-                               goto exit;
-                       }
-               } else if (name[0] != '\0') {
-                       if (lookup_device_by_name(udev, &udevice, name) != 0) {
-                               fprintf(stderr, "node name not found\n");
-                               rc = 4;
-                               goto exit;
-                       }
-                       if (print_device_chain(udev, udevice->dev->devpath) != 0) {
-                               fprintf(stderr, "no valid sysfs device found\n");
-                               rc = 4;
-                               goto exit;
-                       }
-               } else {
-                       fprintf(stderr, "attribute walk needs --path or node --name specified\n");
-                       rc = 5;
+               if (device == NULL) {
+                       fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
+                       rc = 4;
                        goto exit;
                }
+               print_device_chain(device);
                break;
        case ACTION_DEVICE_ID_FILE:
                if (stat_device(name, export, export_prefix) != 0)
-                       rc = 6;
+                       rc = 1;
                break;
        case ACTION_ROOT:
                printf("%s\n", udev_get_dev_path(udev));
@@ -498,6 +472,6 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
        }
 
 exit:
-       udev_device_cleanup(udevice);
+       udev_device_unref(device);
        return rc;
 }