chiark / gitweb /
libudev: udev_device_get_devname -> udev_device_get_devnode
[elogind.git] / udev / udevadm-info.c
index 6501b57..dbcaaff 100644 (file)
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-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
- *     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 "udev.h"
 
-static void print_all_attributes(const char *devpath, const char *key)
+static void print_all_attributes(struct udev_device *device, const char *key)
 {
-       char path[PATH_SIZE];
        DIR *dir;
        struct dirent *dent;
 
-       strlcpy(path, sysfs_path, sizeof(path));
-       strlcat(path, devpath, sizeof(path));
-
-       dir = opendir(path);
+       dir = opendir(udev_device_get_syspath(device));
        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];
+                       char filename[UTIL_PATH_SIZE];
+                       const char *value;
                        size_t len;
 
                        if (dent->d_name[0] == '.')
@@ -59,47 +51,39 @@ static void print_all_attributes(const char *devpath, const char *key)
                        if (strcmp(dent->d_name, "dev") == 0)
                                continue;
 
-                       strlcpy(filename, path, sizeof(filename));
-                       strlcat(filename, "/", sizeof(filename));
-                       strlcat(filename, dent->d_name, sizeof(filename));
+                       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)
                                continue;
                        if (S_ISLNK(statbuf.st_mode))
                                continue;
 
-                       attr_value = sysfs_attr_get_value(devpath, dent->d_name);
-                       if (attr_value == NULL)
+                       value = udev_device_get_attr_value(device, dent->d_name);
+                       if (value == NULL)
                                continue;
-                       len = strlcpy(value, attr_value, sizeof(value));
-                       if(len >= sizeof(value))
-                               len = sizeof(value) - 1;
-                       dbg("attr '%s'='%s'(%zi)\n", dent->d_name, value, len);
-
-                       /* remove trailing newlines */
-                       while (len && value[len-1] == '\n')
-                               value[--len] = '\0';
+                       dbg(udev, "attr '%s'='%s'(%zi)\n", dent->d_name, value, len);
 
                        /* skip nonprintable attributes */
-                       while (len && isprint(value[len-1]))
+                       len = strlen(value);
+                       while (len > 0 && isprint(value[len-1]))
                                len--;
-                       if (len) {
-                               dbg("attribute value of '%s' non-printable, skip\n", dent->d_name);
+                       if (len > 0) {
+                               dbg(info, "attribute value of '%s' non-printable, skip\n", dent->d_name);
                                continue;
                        }
 
                        printf("    %s{%s}==\"%s\"\n", key, dent->d_name, value);
                }
+               closedir(dir);
        }
        printf("\n");
 }
 
-static int print_device_chain(const char *devpath)
+static int print_device_chain(struct udev_device *device)
 {
-       struct sysfs_device *dev;
-
-       dev = sysfs_device_get(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"
@@ -109,110 +93,160 @@ static int print_device_chain(const char *devpath)
               "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(dev->devpath, "ATTR");
-
-       /* walk up the chain of devices */
-       while (1) {
-               dev = sysfs_device_get_parent(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);
+               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);
 
-               print_all_attributes(dev->devpath, "ATTRS");
-       }
+       return 0;
+}
 
+static int print_record_devlinks_cb(struct udev_device *device, const char *value, void *data)
+{
+       size_t len;
+
+       len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
+       printf("S: %s\n", &value[len+1]);
        return 0;
 }
 
-static void print_record(struct udevice *udev)
+static int print_record_properties_cb(struct udev_device *device, const char *key, const char *value, void *data)
 {
-       struct name_entry *name_loop;
-
-       printf("P: %s\n", udev->dev->devpath);
-       printf("N: %s\n", udev->name);
-       list_for_each_entry(name_loop, &udev->symlink_list, node)
-               printf("S: %s\n", name_loop->name);
-       if (udev->link_priority != 0)
-               printf("L: %i\n", udev->link_priority);
-       if (udev->partitions != 0)
-               printf("A:%u\n", udev->partitions);
-       if (udev->ignore_remove)
-               printf("R:%u\n", udev->ignore_remove);
-       list_for_each_entry(name_loop, &udev->env_list, node)
-               printf("E: %s\n", name_loop->name);
+       printf("E: %s=%s\n", key, value);
+       return 0;
 }
 
-static void export_db(void) {
-       LIST_HEAD(name_list);
-       struct name_entry *name_loop;
-
-       udev_db_get_all_entries(&name_list);
-       list_for_each_entry(name_loop, &name_list, node) {
-               struct udevice *udev_db;
-
-               udev_db = udev_device_init();
-               if (udev_db == NULL)
-                       continue;
-               if (udev_db_get_device(udev_db, name_loop->name) == 0)
-                       print_record(udev_db);
-                       printf("\n");
-               udev_device_cleanup(udev_db);
-       }
-       name_list_cleanup(&name_list);
+static void print_record(struct udev_device *device)
+{
+       size_t len;
+       int i;
+
+       printf("P: %s\n", udev_device_get_devpath(device));
+       len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
+       printf("N: %s\n", &udev_device_get_devnode(device)[len+1]);
+       i = device_get_devlink_priority(device);
+       if (i != 0)
+               printf("L: %i\n", i);
+       i = device_get_num_fake_partitions(device);
+       if (i != 0)
+               printf("A:%u\n", i);
+       i = device_get_ignore_remove(device);
+       if (i != 0)
+               printf("R:%u\n", i);
+       udev_device_get_devlinks(device, print_record_devlinks_cb, NULL);
+       udev_device_get_properties(device, print_record_properties_cb, NULL);
+       printf("\n");
 }
 
-static int lookup_device_by_name(struct udevice **udev, const char *name)
+static int export_all_cb(struct udev_device *device, void *data)
 {
+       if (udev_device_get_devnode(device) != NULL)
+               print_record(device);
+       return 0;
+}
+
+static struct udev_device *lookup_device_by_name(struct udev *udev, const char *name)
+{
+       struct udev_device *udev_device = NULL;
        LIST_HEAD(name_list);
        int count;
        struct name_entry *device;
-       int rc  = -1;
 
-       count = udev_db_get_devices_by_name(name, &name_list);
+       count = udev_db_get_devices_by_name(udev, name, &name_list);
        if (count <= 0)
                goto out;
 
-       info("found %i devices for '%s'\n", count, name);
+       info(udev, "found %i devices for '%s'\n", count, name);
 
-       /* select the device that seems to match */
+       /* select the device that matches */
        list_for_each_entry(device, &name_list, node) {
-               struct udevice *udev_loop;
-               char filename[PATH_SIZE];
+               struct udevice *udevice_loop;
+               char filename[UTIL_PATH_SIZE];
                struct stat statbuf;
 
-               udev_loop = udev_device_init();
-               if (udev_loop == NULL)
+               udevice_loop = udev_device_init(udev);
+               if (udevice_loop == NULL)
                        break;
-               if (udev_db_get_device(udev_loop, device->name) != 0)
+               if (udev_db_get_device(udevice_loop, device->name) != 0)
                        goto next;
-               info("found db entry '%s'\n", device->name);
-
+               info(udev, "found db entry '%s'\n", device->name);
                /* make sure, we don't get a link of a different device */
-               strlcpy(filename, udev_root, sizeof(filename));
-               strlcat(filename, "/", sizeof(filename));
-               strlcat(filename, name, sizeof(filename));
+               util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
+               util_strlcat(filename, "/", sizeof(filename));
+               util_strlcat(filename, name, sizeof(filename));
                if (stat(filename, &statbuf) != 0)
                        goto next;
-               if (major(udev_loop->devt) > 0 && udev_loop->devt != statbuf.st_rdev) {
-                       info("skip '%s', dev_t doesn't match\n", udev_loop->name);
+               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;
-               *udev = udev_loop;
+               util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
+               util_strlcat(filename,  udevice_loop->dev->devpath, sizeof(filename));
+               udev_device = udev_device_new_from_syspath(udev, filename);
+               udev_device_cleanup(udevice_loop);
                break;
 next:
-               udev_device_cleanup(udev_loop);
+               udev_device_cleanup(udevice_loop);
        }
 out:
-       name_list_cleanup(&name_list);
-       return rc;
+       name_list_cleanup(udev, &name_list);
+       return udev_device;
+}
+
+static int add_devlink_cb(struct udev_device *device, const char *value, void *data)
+{
+       char **links = data;
+
+       if (*links == NULL) {
+               *links = strdup(value);
+       } else {
+               char *str;
+
+               asprintf(&str, "%s %s", *links, value);
+               free(*links);
+               *links = str;
+       }
+       return 0;
+}
+
+static int add_devlink_noroot_cb(struct udev_device *device, const char *value, void *data)
+{
+       size_t len;
+
+       len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
+       value = &value[len+1];
+       return add_devlink_cb(device, value, data);
+}
+
+static int print_property_cb(struct udev_device *device, const char *key, const char *value, void *data)
+{
+       printf("%s=%s\n", key, value);
+       return 0;
 }
 
 static int stat_device(const char *name, int export, const char *prefix)
@@ -234,13 +268,16 @@ static int stat_device(const char *name, int export, const char *prefix)
        return 0;
 }
 
-int udevinfo(int argc, char *argv[])
+int udevadm_info(struct udev *udev, int argc, char *argv[])
 {
-       int option;
-       struct udevice *udev = NULL;
+       struct udev_device *device = NULL;
        int root = 0;
        int export = 0;
        const char *export_prefix = NULL;
+       char path[UTIL_PATH_SIZE];
+       char name[UTIL_PATH_SIZE];
+       char *links;
+       int rc = 0;
 
        static const struct option options[] = {
                { "name", 1, NULL, 'n' },
@@ -274,59 +311,44 @@ int udevinfo(int argc, char *argv[])
                QUERY_ALL,
        } query = QUERY_NONE;
 
-       char path[PATH_SIZE] = "";
-       char name[PATH_SIZE] = "";
-       struct name_entry *name_loop;
-       int rc = 0;
-
-       logging_init("udevinfo");
-       udev_config_init();
-       sysfs_init();
-
        while (1) {
+               int option;
+
                option = getopt_long(argc, argv, "aed:n:p:q:rxPVh", options, NULL);
                if (option == -1)
                        break;
 
-               dbg("option '%c'\n", option);
+               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_root, strlen(udev_root)) == 0)
-                               strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
+                       if (strncmp(optarg, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) == 0)
+                               util_strlcpy(name, &optarg[strlen(udev_get_dev_path(udev))+1], sizeof(name));
                        else
-                               strlcpy(name, optarg, sizeof(name));
-                       remove_trailing_chars(name, '/');
-                       dbg("name: %s\n", name);
+                               util_strlcpy(name, optarg, sizeof(name));
+                       util_remove_trailing_chars(name, '/');
+                       device = lookup_device_by_name(udev, name);
                        break;
                case 'p':
-                       /* remove /sys if given */
-                       if (strncmp(optarg, sysfs_path, strlen(sysfs_path)) == 0)
-                               strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
-                       else
-                               strlcpy(path, optarg, sizeof(path));
-                       remove_trailing_chars(path, '/');
-
-                       /* possibly resolve to real devpath */
-                       if (sysfs_resolve_link(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(temp, sizeof(temp)) == 0) {
-                                               strlcpy(path, temp, sizeof(path));
-                                               strlcat(path, tail, sizeof(path));
-                                       }
-                               }
+                       if (device != NULL) {
+                               fprintf(stderr, "device already specified\n");
+                               rc = 2;
+                               goto exit;
                        }
-                       dbg("path: %s\n", path);
+                       /* add /sys 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));
+                       }
+                       util_remove_trailing_chars(path, '/');
+                       device = udev_device_new_from_syspath(udev, path);
                        break;
                case 'q':
                        action = ACTION_QUERY;
@@ -360,13 +382,13 @@ int udevinfo(int argc, char *argv[])
                        break;
                case 'd':
                        action = ACTION_DEVICE_ID_FILE;
-                       strlcpy(name, optarg, sizeof(name));
+                       util_strlcpy(name, optarg, sizeof(name));
                        break;
                case 'a':
                        action = ACTION_ATTRIBUTE_WALK;
                        break;
                case 'e':
-                       export_db();
+                       udev_enumerate_devices(udev, NULL, export_all_cb, NULL);
                        goto exit;
                case 'x':
                        export = 1;
@@ -403,59 +425,42 @@ int udevinfo(int argc, char *argv[])
                }
        }
 
-       /* run action */
        switch (action) {
        case ACTION_QUERY:
-               /* needs devpath or node/symlink name for query */
-               if (path[0] != '\0') {
-                       udev = udev_device_init();
-                       if (udev == NULL) {
-                               rc = 1;
-                               goto exit;
-                       }
-                       if (udev_db_get_device(udev, 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, 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_root, udev->name);
-                       else
-                               printf("%s\n", udev->name);
-                       break;
-               case QUERY_SYMLINK:
-                       list_for_each_entry(name_loop, &udev->symlink_list, node) {
-                               char c = name_loop->node.next != &udev->symlink_list ? ' ' : '\n';
+                       if (root) {
+                               printf("%s\n", udev_device_get_devnode(device));
+                       } else {
+                               size_t len;
 
-                               if (root)
-                                       printf("%s/%s%c", udev_root, name_loop->name, c);
-                               else
-                                       printf("%s%c", name_loop->name, c);
+                               len = strlen(udev_get_dev_path(udev));
+                               printf("%s\n", &udev_device_get_devnode(device)[len+1]);
                        }
                        break;
+               case QUERY_SYMLINK:
+                       links = NULL;
+                       if (root)
+                               udev_device_get_devlinks(device, add_devlink_cb, &links);
+                       else
+                               udev_device_get_devlinks(device, add_devlink_noroot_cb, &links);
+                       printf("%s\n", links);
+                       free(links);
+                       break;
                case QUERY_PATH:
-                       printf("%s\n", udev->dev->devpath);
+                       printf("%s\n", udev_device_get_devpath(device));
                        goto exit;
                case QUERY_ENV:
-                       list_for_each_entry(name_loop, &udev->env_list, node)
-                               printf("%s\n", name_loop->name);
+                       udev_device_get_properties(device, print_property_cb, NULL);
                        break;
                case QUERY_ALL:
-                       print_record(udev);
+                       print_record(device);
                        break;
                default:
                        fprintf(stderr, "unknown query type\n");
@@ -463,35 +468,19 @@ int udevinfo(int argc, char *argv[])
                }
                break;
        case ACTION_ATTRIBUTE_WALK:
-               if (path[0] != '\0') {
-                       if (print_device_chain(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, name) != 0) {
-                               fprintf(stderr, "node name not found\n");
-                               rc = 4;
-                               goto exit;
-                       }
-                       if (print_device_chain(udev->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");
+               if (device == NULL) {
+                       fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
                        rc = 5;
                        goto exit;
                }
+               print_device_chain(device);
                break;
        case ACTION_DEVICE_ID_FILE:
                if (stat_device(name, export, export_prefix) != 0)
                        rc = 6;
                break;
        case ACTION_ROOT:
-               printf("%s\n", udev_root);
+               printf("%s\n", udev_get_dev_path(udev));
                break;
        default:
                fprintf(stderr, "missing option\n");
@@ -500,8 +489,6 @@ int udevinfo(int argc, char *argv[])
        }
 
 exit:
-       udev_device_cleanup(udev);
-       sysfs_cleanup();
-       logging_close();
+       udev_device_unref(device);
        return rc;
 }