more merge fixups

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 6e6b9aeb3ed572e1b398ca0605f9845c8c4736fd..340496b42b339b707137f65322c51633f23266e4 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -401,7 +401,7 @@ print:
                        break;
 
                case PATH:
-                       strfieldcpy(result, udev.devpath);
+                       strfieldcpy(result, path);
                        break;
 
                case ALL:
@@ -439,7 +439,7 @@ exit:
        }
 
 help:
-       printf("Usage: [-anpqrdVh]\n"
+       printf("Usage: udevinfo [-anpqrdVh]\n"
               "  -q TYPE  query database for the specified value:\n"
               "             'name'    name of device node\n"
               "             'symlink' pointing to node\n"