start to enforce plain ascii or valid utf8

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 58584d62f807d5851ff4df0e6e701d760f28e176..c7d801b87c47bcb90e1842f628dc6d25e70bf384 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -88,6 +88,8 @@ static int print_record(struct udevice *udev)
        printf("N: %s\n", udev->name);
        list_for_each_entry(name_loop, &udev->symlink_list, node)
                printf("S: %s\n", name_loop->name);
+       list_for_each_entry(name_loop, &udev->env_list, node)
+               printf("E: %s\n", name_loop->name);
 
        return 0;
 }
@@ -165,9 +167,20 @@ exit:
        return retval;
 }
 
-static int print_dump(const char *devpath, const char *name) {
-       printf("%s=%s/%s\n", devpath, udev_root, name);
-       return 0;
+static void dump_names(void) {
+       LIST_HEAD(name_list);
+       struct name_entry *name_loop;
+
+       udev_db_get_all_entries(&name_list);
+       list_for_each_entry(name_loop, &name_list, node) {
+               struct udevice udev_db;
+
+               udev_init_device(&udev_db, NULL, NULL, NULL);
+               if (udev_db_get_device(&udev_db, name_loop->name) == 0)
+                       printf("%s=%s/%s\n", udev_db.devpath, udev_root, udev_db.name);
+               udev_cleanup_device(&udev_db);
+       }
+       name_list_cleanup(&name_list);
 }
 
 int main(int argc, char *argv[], char *envp[])
@@ -256,7 +269,7 @@ int main(int argc, char *argv[], char *envp[])
                        break;
 
                case 'd':
-                       udev_db_dump_names(print_dump);
+                       dump_names();
                        goto exit;
 
                case 'V':
@@ -306,9 +319,9 @@ int main(int argc, char *argv[], char *envp[])
                        } else
                                pos = name;
 
-                       retval = udev_db_search_name(devpath, sizeof(devpath), pos);
+                       retval = udev_db_lookup_name(pos, devpath, sizeof(devpath));
                        if (retval != 0) {
-                               fprintf(stderr, "device not found in database\n");
+                               fprintf(stderr, "no record for '%s' in database\n", pos);
                                goto exit;
                        }
                        udev_db_get_device(&udev, devpath);