udevinfo: exclude "uevent" file from --attribute-walk

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 8e54705fe36689adaad84c4f6de851d99120e3bc..a2bc0136913070d569a62cf87a77d07181ab8977 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -67,6 +67,9 @@ static void print_all_attributes(const char *devpath, const char *key)
                        if (dent->d_name[0] == '.')
                                continue;
 
                        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));
                        strlcpy(filename, path, sizeof(filename));
                        strlcat(filename, "/", sizeof(filename));
                        strlcat(filename, dent->d_name, sizeof(filename));


@@ -385,21 +388,14 @@ int main(int argc, char *argv[], char *envp[])
                                printf("%s\n", udev->name);
                        break;
                case QUERY_SYMLINK:
                                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);
                        break;
                case QUERY_PATH:
                        printf("%s\n", udev->dev->devpath);