udevadm: merge all udev tools into a single binary

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 8e54705fe36689adaad84c4f6de851d99120e3bc..fc45f7565d192e778173b15bc9d293c69ce62dd8 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -31,21 +31,6 @@
 
 #include "udev.h"
 
-
-#ifdef USE_LOG
-void log_message (int priority, const char *format, ...)
-{
-       va_list args;
-
-       if (priority > udev_log_priority)
-               return;
-
-       va_start(args, format);
-       vsyslog(priority, format, args);
-       va_end(args);
-}
-#endif
-
 static void print_all_attributes(const char *devpath, const char *key)
 {
        char path[PATH_SIZE];
@@ -67,6 +52,9 @@ static void print_all_attributes(const char *devpath, const char *key)
                        if (dent->d_name[0] == '.')
                                continue;
 
+                       if (strcmp(dent->d_name, "uevent") == 0)
+                               continue;
+
                        strlcpy(filename, path, sizeof(filename));
                        strlcat(filename, "/", sizeof(filename));
                        strlcat(filename, dent->d_name, sizeof(filename));
@@ -218,7 +206,7 @@ out:
        return rc;
 }
 
-int main(int argc, char *argv[], char *envp[])
+int udevinfo(int argc, char *argv[], char *envp[])
 {
        int option;
        struct udevice *udev;
@@ -333,7 +321,7 @@ int main(int argc, char *argv[], char *envp[])
                        printf("udevinfo, version %s\n", UDEV_VERSION);
                        goto exit;
                case 'h':
-                       printf("Usage: udevinfo OPTIONS\n"
+                       printf("Usage: udevadm info OPTIONS\n"
                               "  --query=<type>    query database for the specified value:\n"
                               "    name            name of device node\n"
                               "    symlink         pointing to node\n"
@@ -385,21 +373,14 @@ int main(int argc, char *argv[], char *envp[])
                                printf("%s\n", udev->name);
                        break;
                case QUERY_SYMLINK:
-                       if (list_empty(&udev->symlink_list))
-                               goto exit;
-                       if (root)
-                               list_for_each_entry(name_loop, &udev->symlink_list, node)
-                                       if (name_loop->node.next != &udev->symlink_list)
-                                               printf("%s/%s ", udev_root, name_loop->name);
-                                       else
-                                               printf("%s/%s", udev_root, name_loop->name);
-                       else
-                               list_for_each_entry(name_loop, &udev->symlink_list, node)
-                                       if (name_loop->node.next != &udev->symlink_list)
-                                               printf("%s ", name_loop->name);
-                                       else
-                                               printf("%s", name_loop->name);
-                       printf("\n");
+                       list_for_each_entry(name_loop, &udev->symlink_list, node) {
+                               char c = name_loop->node.next != &udev->symlink_list ? ' ' : '\n';
+
+                               if (root)
+                                       printf("%s/%s%c", udev_root, name_loop->name, c);
+                               else
+                                       printf("%s%c", name_loop->name, c);
+                       }
                        break;
                case QUERY_PATH:
                        printf("%s\n", udev->dev->devpath);