[PATCH] update Fedora config files and add some more tests

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 013068541e82eba50ebd62fdd5c479ab8f5b8085..00af081eacfc1fccde721cb711aef27e3c6011c0 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -30,7 +30,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "libsysfs/dlist.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "udev_db.h"
 #include "logging.h"
@@ -39,7 +39,6 @@
 #define SYSFS_VALUE_SIZE               256
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;
@@ -142,7 +141,7 @@ static int print_device_chain(const char *path)
 
        /* look for the 'dev' file */
        attr = sysfs_get_classdev_attr(class_dev, "dev");
-       if (attr == NULL)
+       if (attr != NULL)
                printf("device '%s' has major:minor %s", class_dev->path, attr->value);
 
        /* open sysfs class device directory and print all attributes */
@@ -242,7 +241,7 @@ static int print_sysfs_devices(void)
 
 static int process_options(int argc, char *argv[])
 {
-       static const char short_options[] = "adn:p:q:rsVh";
+       static const char short_options[] = "an:p:q:rsVh";
        int option;
        int retval = 1;
        struct udevice udev;
@@ -401,7 +400,7 @@ print:
                        break;
 
                case PATH:
-                       strfieldcpy(result, path);
+                       strfieldcpy(result, udev.devpath);
                        break;
 
                case ALL:
@@ -439,7 +438,7 @@ exit:
        }
 
 help:
-       printf("Usage: [-anpqrdVh]\n"
+       printf("Usage: udevinfo [-anpqrVh]\n"
               "  -q TYPE  query database for the specified value:\n"
               "             'name'    name of device node\n"
               "             'symlink' pointing to node\n"