X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-hwdb.c;h=95476648f99cd0ec4e5bda72a69a693e387e7774;hb=2a560338c471f47ca0caf6f1ec8c54a61e005d7f;hp=36958916c46185ebbf29476d64e0a8c26f0099a7;hpb=6824690f140f45064157d220a24b9afbeb1d093f;p=elogind.git diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index 36958916c..95476648f 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -27,24 +27,34 @@ #include #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 *modalias, const char *filter, bool test) { - struct udev_list_entry *entry; + const char *prefix, const char *modalias, + const char *filter, bool test) { + _cleanup_free_ const char *lookup = NULL; + const char *key, *value; int n = 0; if (!hwdb) return -ENOENT; - udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, modalias, 0)) { - if (filter && fnmatch(filter, udev_list_entry_get_name(entry), FNM_NOESCAPE) != 0) + if (prefix) { + lookup = strjoin(prefix, modalias, NULL); + if (!lookup) + return -ENOMEM; + modalias = lookup; + } + + 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++; } @@ -72,12 +82,14 @@ static const char *modalias_usb(struct udev_device *dev, char *s, size_t size) { } static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device *srcdev, - const char *subsystem, const char *filter, bool test) { + const char *subsystem, const char *prefix, + 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; @@ -89,22 +101,26 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device if (subsystem && !streq(dsubsys, subsystem)) continue; - /* the usb_device does not have a modalias, compose one */ - if (streq(dsubsys, "usb")) - modalias = modalias_usb(d, s, sizeof(s)); + modalias = udev_device_get_property_value(d, "MODALIAS"); - if (!modalias) - modalias = udev_device_get_property_value(d, "MODALIAS"); + 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, 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) { @@ -112,11 +128,13 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te { "filter", required_argument, NULL, 'f' }, { "device", required_argument, NULL, 'd' }, { "subsystem", required_argument, NULL, 's' }, + { "lookup-prefix", required_argument, NULL, 'p' }, {} }; const char *filter = NULL; const char *device = NULL; const char *subsystem = NULL; + const char *prefix = NULL; struct udev_device *srcdev; if (!hwdb) @@ -125,7 +143,7 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te for (;;) { int option; - option = getopt_long(argc, argv, "s", options, NULL); + option = getopt_long(argc, argv, "f:d:s:p:", options, NULL); if (option == -1) break; @@ -141,12 +159,16 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te case 's': subsystem = optarg; break; + + case 'p': + prefix = optarg; + break; } } /* query a specific key given as argument */ if (argv[optind]) { - if (udev_builtin_hwdb_lookup(dev, argv[optind], filter, test) > 0) + if (udev_builtin_hwdb_lookup(dev, prefix, argv[optind], filter, test) > 0) return EXIT_SUCCESS; return EXIT_FAILURE; } @@ -159,32 +181,33 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te } else srcdev = dev; - if (udev_builtin_hwdb_search(dev, srcdev, subsystem, filter, test) < 0) - return EXIT_FAILURE; - return EXIT_SUCCESS; + if (udev_builtin_hwdb_search(dev, srcdev, subsystem, prefix, filter, test) > 0) + return EXIT_SUCCESS; + return EXIT_FAILURE; } /* called at udev startup and reload */ -static int builtin_hwdb_init(struct udev *udev) -{ +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); +static void builtin_hwdb_exit(struct udev *udev) { + 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); +static bool builtin_hwdb_validate(struct udev *udev) { + return hwdb_validate(hwdb); } const struct udev_builtin udev_builtin_hwdb = { @@ -193,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", };