X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-hwdb.c;h=95476648f99cd0ec4e5bda72a69a693e387e7774;hb=76f282c636f33b41bdbc93a5b2945945ee0029bf;hp=60f647183f67561f9805893aa8019ea2315b1309;hpb=2001208c2ab631a69896d1f670c26846b70d1fb7;p=elogind.git diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index 60f647183..95476648f 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -1,7 +1,7 @@ /*** This file is part of systemd. - Copyright 2012 Kay Sievers + Copyright 2012 Kay Sievers systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -23,22 +23,119 @@ #include #include #include +#include #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 *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; + + 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, key, value) < 0) + return -ENOMEM; + n++; + } + return n; +} + +static const char *modalias_usb(struct udev_device *dev, char *s, size_t size) { + const char *v, *p; + int vn, pn; + + v = udev_device_get_sysattr_value(dev, "idVendor"); + if (!v) + return NULL; + p = udev_device_get_sysattr_value(dev, "idProduct"); + if (!p) + return NULL; + vn = strtol(v, NULL, 16); + if (vn <= 0) + return NULL; + pn = strtol(p, NULL, 16); + if (pn <= 0) + return NULL; + snprintf(s, size, "usb:v%04Xp%04X*", vn, pn); + return s; +} + +static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device *srcdev, + const char *subsystem, const char *prefix, + const char *filter, bool test) { + struct udev_device *d; + char s[16]; + bool last = false; + int r = 0; + + for (d = srcdev; d && !last; d = udev_device_get_parent(d)) { + const char *dsubsys; + const char *modalias = NULL; + + dsubsys = udev_device_get_subsystem(d); + if (!dsubsys) + continue; + + /* look only at devices of a specific subsystem */ + if (subsystem && !streq(dsubsys, subsystem)) + continue; + + 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; + + r = udev_builtin_hwdb_lookup(dev, prefix, modalias, filter, test); + if (r > 0) + break; + } + + return r; +} static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool test) { static const struct option options[] = { + { "filter", required_argument, NULL, 'f' }, + { "device", required_argument, NULL, 'd' }, { "subsystem", required_argument, NULL, 's' }, + { "lookup-prefix", required_argument, NULL, 'p' }, {} }; - const char *subsys = NULL; - struct udev_device *d; - const char *modalias; - char str[UTIL_NAME_SIZE]; - struct udev_list_entry *entry; + const char *filter = NULL; + const char *device = NULL; + const char *subsystem = NULL; + const char *prefix = NULL; + struct udev_device *srcdev; if (!hwdb) return EXIT_FAILURE; @@ -46,83 +143,71 @@ 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; switch (option) { - case 's': - subsys = optarg; + case 'f': + filter = optarg; break; - } - } - - /* search the first parent device with a modalias */ - for (d = dev; d; d = udev_device_get_parent(d)) { - const char *dsubsys = udev_device_get_subsystem(d); - /* look only at devices of a specific subsystem */ - if (subsys && dsubsys && !streq(dsubsys, subsys)) - continue; + case 'd': + device = optarg; + break; - modalias = udev_device_get_property_value(d, "MODALIAS"); - if (modalias) + case 's': + subsystem = optarg; break; - /* the usb_device does not have modalias, compose one */ - if (dsubsys && streq(dsubsys, "usb")) { - const char *v, *p; - int vn, pn; - - v = udev_device_get_sysattr_value(d, "idVendor"); - if (!v) - continue; - p = udev_device_get_sysattr_value(d, "idProduct"); - if (!p) - continue; - vn = strtol(v, NULL, 16); - if (vn <= 0) - continue; - pn = strtol(p, NULL, 16); - if (pn <= 0) - continue; - snprintf(str, sizeof(str), "usb:v%04Xp%04X*", vn, pn); - modalias = str; + case 'p': + prefix = optarg; break; } } - if (!modalias) + + /* query a specific key given as argument */ + if (argv[optind]) { + if (udev_builtin_hwdb_lookup(dev, prefix, argv[optind], filter, test) > 0) + return EXIT_SUCCESS; return EXIT_FAILURE; + } - udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, modalias, 0)) - if (udev_builtin_add_property(dev, test, - udev_list_entry_get_name(entry), - udev_list_entry_get_value(entry)) < 0) + /* read data from another device than the device we will store the data */ + if (device) { + srcdev = udev_device_new_from_device_id(udev_device_get_udev(dev), device); + if (!srcdev) return EXIT_FAILURE; - return EXIT_SUCCESS; + } else + srcdev = dev; + + 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 = { @@ -131,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", };