move udev_device_db to libudev

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

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index e470ff624da662997ae1865ad965ca4eaa18cfad..78c218eef0b22355d2d08a74c4d76a309b1f3a8a 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -32,6 +32,7 @@
 
 static void print_all_attributes(struct udev_device *device, const char *key)
 {
+       struct udev *udev = udev_device_get_udev(device);
        DIR *dir;
        struct dirent *dent;
 
@@ -69,7 +70,7 @@ static void print_all_attributes(struct udev_device *device, const char *key)
                        while (len > 0 && isprint(value[len-1]))
                                len--;
                        if (len > 0) {
-                               dbg(info, "attribute value of '%s' non-printable, skip\n", dent->d_name);
+                               dbg(udev, "attribute value of '%s' non-printable, skip\n", dent->d_name);
                                continue;
                        }
 
@@ -129,23 +130,26 @@ static int print_device_chain(struct udev_device *device)
 static void print_record(struct udev_device *device)
 {
        size_t len;
+       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)));
-       printf("N: %s\n", &udev_device_get_devnode(device)[len+1]);
+       str = udev_device_get_devnode(device);
+       if (str != NULL)
+               printf("N: %s\n", &str[len+1]);
 
-       i = device_get_devlink_priority(device);
+       i = udev_device_get_devlink_priority(device);
        if (i != 0)
                printf("L: %i\n", i);
 
-       i = device_get_num_fake_partitions(device);
+       i = udev_device_get_num_fake_partitions(device);
        if (i != 0)
                printf("A:%u\n", i);
 
-       i = device_get_ignore_remove(device);
+       i = udev_device_get_ignore_remove(device);
        if (i != 0)
                printf("R:%u\n", i);
 
@@ -158,7 +162,6 @@ static void print_record(struct udev_device *device)
                printf("E: %s=%s\n",
                       udev_list_entry_get_name(list_entry),
                       udev_list_entry_get_value(list_entry));
-
        printf("\n");
 }
 
@@ -183,13 +186,14 @@ static int stat_device(const char *name, int export, const char *prefix)
 
 static int export_devices(struct udev *udev)
 {
-       struct udev_enumerate *enumerate;
+       struct udev_enumerate *udev_enumerate;
        struct udev_list_entry *list_entry;
 
-       enumerate = udev_enumerate_new_from_devices(udev, NULL);
-       if (enumerate == NULL)
+       udev_enumerate = udev_enumerate_new(udev);
+       if (udev_enumerate == NULL)
                return -1;
-       udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
+       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));
@@ -199,7 +203,7 @@ static int export_devices(struct udev *udev)
                        udev_device_unref(device);
                }
        }
-       udev_enumerate_unref(enumerate);
+       udev_enumerate_unref(udev_enumerate);
        return 0;
 }
 
@@ -215,17 +219,17 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
        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' },
+               { "device-id-of-file", required_argument, NULL, 'd' },
+               { "export", no_argument, NULL, 'x' },
+               { "export-prefix", required_argument, NULL, 'P' },
+               { "version", no_argument, NULL, 1 }, /* -V outputs braindead format */
+               { "help", no_argument, NULL, 'h' },
                {}
        };
 
@@ -339,7 +343,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                                break;
                        }
                        fprintf(stderr, "unknown query type\n");
-                       rc = 2;
+                       rc = 3;
                        goto exit;
                case 'r':
                        if (action == ACTION_NONE)
@@ -405,9 +409,16 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                                printf("%s\n", udev_device_get_devnode(device));
                        } else {
                                size_t len;
+                               const char *node;
 
                                len = strlen(udev_get_dev_path(udev));
-                               printf("%s\n", &udev_device_get_devnode(device)[len+1]);
+                               node = udev_device_get_devnode(device);
+                               if (node == NULL) {
+                                       fprintf(stderr, "no device node found\n");
+                                       rc = 5;
+                                       goto exit;
+                               }
+                                       printf("%s\n", &udev_device_get_devnode(device)[len+1]);
                        }
                        break;
                case QUERY_SYMLINK:
@@ -448,14 +459,14 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
        case ACTION_ATTRIBUTE_WALK:
                if (device == NULL) {
                        fprintf(stderr, "query needs a valid device specified by --path= or --name=\n");
-                       rc = 5;
+                       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));