fix NAME= and OPTION+="string_escape=..." logic

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

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 78c218eef0b22355d2d08a74c4d76a309b1f3a8a..6fe1f8631328932f6aa64ffb16bd91e1d862ef40 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -60,7 +60,7 @@ static void print_all_attributes(struct udev_device *device, const char *key)
                        if (S_ISLNK(statbuf.st_mode))
                                continue;
 
-                       value = udev_device_get_attr_value(device, dent->d_name);
+                       value = udev_device_get_sysattr_value(device, dent->d_name);
                        if (value == NULL)
                                continue;
                        dbg(udev, "attr '%s'='%s'(%zi)\n", dent->d_name, value, len);
@@ -87,7 +87,7 @@ static int print_device_chain(struct udev_device *device)
        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"
@@ -228,7 +228,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                { "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 */
+               { "version", no_argument, NULL, 'V' },
                { "help", no_argument, NULL, 'h' },
                {}
        };
@@ -366,11 +366,8 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
                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"