udevadm,..: make --help output of udev tools more like the output of the various...

[elogind.git] / src / udev / udev-builtin-hwdb.c

diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index cac97e756bb58e211507f5683a903b06b7edea49..95476648f99cd0ec4e5bda72a69a693e387e7774 100644 (file)
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -27,36 +27,34 @@
 #include <getopt.h>
 
 #include "udev.h"
+#include "sd-hwdb.h"
 
-static struct udev_hwdb *hwdb;
+#include "hwdb-util.h"
+
+static sd_hwdb *hwdb;
 
 int udev_builtin_hwdb_lookup(struct udev_device *dev,
                              const char *prefix, const char *modalias,
                              const char *filter, bool test) {
-        struct udev_list_entry *list;
-        struct udev_list_entry *entry;
+        _cleanup_free_ const char *lookup = NULL;
+        const char *key, *value;
         int n = 0;
 
         if (!hwdb)
                 return -ENOENT;
 
         if (prefix) {
-                _cleanup_free_ const char *lookup;
-
                 lookup = strjoin(prefix, modalias, NULL);
                 if (!lookup)
                         return -ENOMEM;
-                list = udev_hwdb_get_properties_list_entry(hwdb, lookup, 0);
-        } else
-                list = udev_hwdb_get_properties_list_entry(hwdb, modalias, 0);
+                modalias = lookup;
+        }
 
-        udev_list_entry_foreach(entry, list) {
-                if (filter && fnmatch(filter, udev_list_entry_get_name(entry), FNM_NOESCAPE) != 0)
+        SD_HWDB_FOREACH_PROPERTY(hwdb, modalias, key, value) {
+                if (filter && fnmatch(filter, key, FNM_NOESCAPE) != 0)
                         continue;
 
-                if (udev_builtin_add_property(dev, test,
-                                              udev_list_entry_get_name(entry),
-                                              udev_list_entry_get_value(entry)) < 0)
+                if (udev_builtin_add_property(dev, test, key, value) < 0)
                         return -ENOMEM;
                 n++;
         }
@@ -88,9 +86,10 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device
                                     const char *filter, bool test) {
         struct udev_device *d;
         char s[16];
-        int n = 0;
+        bool last = false;
+        int r = 0;
 
-        for (d = srcdev; d; d = udev_device_get_parent(d)) {
+        for (d = srcdev; d && !last; d = udev_device_get_parent(d)) {
                 const char *dsubsys;
                 const char *modalias = NULL;
 
@@ -104,19 +103,24 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device
 
                 modalias = udev_device_get_property_value(d, "MODALIAS");
 
-                /* the usb_device does not have a modalias, compose one */
-                if (!modalias && streq(dsubsys, "usb"))
-                        modalias = modalias_usb(d, s, sizeof(s));
+                if (streq(dsubsys, "usb") && streq_ptr(udev_device_get_devtype(d), "usb_device")) {
+                        /* if the usb_device does not have a modalias, compose one */
+                        if (!modalias)
+                                modalias = modalias_usb(d, s, sizeof(s));
+
+                        /* avoid looking at any parent device, they are usually just a USB hub */
+                        last = true;
+                }
 
                 if (!modalias)
                         continue;
 
-                n = udev_builtin_hwdb_lookup(dev, prefix, modalias, filter, test);
-                if (n > 0)
+                r = udev_builtin_hwdb_lookup(dev, prefix, modalias, filter, test);
+                if (r > 0)
                         break;
         }
 
-        return n;
+        return r;
 }
 
 static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool test) {
@@ -184,22 +188,26 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te
 
 /* called at udev startup and reload */
 static int builtin_hwdb_init(struct udev *udev) {
+        int r;
+
         if (hwdb)
                 return 0;
-        hwdb = udev_hwdb_new(udev);
-        if (!hwdb)
-                return -ENOMEM;
+
+        r = sd_hwdb_new(&hwdb);
+        if (r < 0)
+                return r;
+
         return 0;
 }
 
 /* called on udev shutdown and reload request */
 static void builtin_hwdb_exit(struct udev *udev) {
-        hwdb = udev_hwdb_unref(hwdb);
+        hwdb = sd_hwdb_unref(hwdb);
 }
 
 /* called every couple of seconds during event activity; 'true' if config has changed */
 static bool builtin_hwdb_validate(struct udev *udev) {
-        return udev_hwdb_validate(hwdb);
+        return hwdb_validate(hwdb);
 }
 
 const struct udev_builtin udev_builtin_hwdb = {
@@ -208,5 +216,5 @@ const struct udev_builtin udev_builtin_hwdb = {
         .init = builtin_hwdb_init,
         .exit = builtin_hwdb_exit,
         .validate = builtin_hwdb_validate,
-        .help = "hardware database",
+        .help = "Hardware database",
 };