diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-03 10:33:15 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-03 10:33:15 +0200 |
| commit | ee137da3897d154e0c62b03ea7ef3c3359753adc (patch) | |
| tree | a1447cf8bd6bc9191d8f797edd132ca4f8882b46 | |
| parent | 2f1a291e2f50075e46cd55568a5ba6ba4f6a2afc (diff) | |
udevadm: info - fix --query=all for devices without a device node
| -rw-r--r-- | udev/lib/test-libudev.c | 2 | ||||
| -rw-r--r-- | udev/udevadm-info.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c index 47fbf3b42a..854a0a9faa 100644 --- a/udev/lib/test-libudev.c +++ b/udev/lib/test-libudev.c @@ -104,7 +104,7 @@ static int test_device(struct udev *udev, const char *syspath) printf("looking at device: %s\n", syspath); device = udev_device_new_from_syspath(udev, syspath); if (device == NULL) { - printf("no device\n"); + printf("no device found\n"); return -1; } print_device(device); diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c index ec098abd18..b18f249495 100644 --- a/udev/udevadm-info.c +++ b/udev/udevadm-info.c @@ -130,13 +130,16 @@ 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); if (i != 0) @@ -159,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"); } |