[PATCH] correct apply_format() for symlink only rules

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index b15f174e4032706d5c36fee31cadb8bc0fb0de50..dc3f94fffe364deb241f8738f8d914d789c8f7cd 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,6 +30,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "libsysfs/dlist.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udevdb.h"
@@ -41,7 +42,7 @@ char **main_argv;
 int main_argc;
 
 #ifdef LOG
-unsigned char logname[42];
+unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;
@@ -111,6 +112,9 @@ static int print_record(char *path, struct udevice *dev)
        printf("S: %s\n", dev->symlink);
        printf("O: %s\n", dev->owner);
        printf("G: %s\n", dev->group);
+       printf("F: %s\n", dev->config_file);
+       printf("L: %i\n", dev->config_line);
+       printf("T: %li\n", dev->config_time);
        printf("\n");
        return 0;
 }
@@ -151,10 +155,10 @@ static int print_device_chain(const char *path)
        }
 
        printf("\nudevinfo starts with the device the node belongs to and then walks up the\n"
-              "device chain to print for every device found all possibly useful attributes\n"
+              "device chain, to print for every device found, all possibly useful attributes\n"
               "in the udev key format.\n"
-              "Only attributes within one device section may be used in a rule to match the\n"
-              "device for which the node will be created.\n"
+              "Only attributes within one device section may be used together in one rule,\n"
+              "to match the device for which the node will be created.\n"
               "\n");
        printf("device '%s' has major:minor %s", class_dev->path, attr->value);
        sysfs_close_attribute(attr);