diff options
| -rw-r--r-- | src/udev/udev-builtin-hwdb.c | 40 | ||||
| -rw-r--r-- | src/udev/udev-builtin-net_id.c | 2 | ||||
| -rw-r--r-- | src/udev/udev.h | 2 |
3 files changed, 36 insertions, 8 deletions
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index 0b35d799fe..9895f651c5 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -23,13 +23,15 @@ #include <inttypes.h> #include <ctype.h> #include <stdlib.h> +#include <fnmatch.h> #include <getopt.h> #include "udev.h" static struct udev_hwdb *hwdb; -int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *modalias, bool test) { +int udev_builtin_hwdb_lookup(struct udev_device *dev, + const char *modalias, const char *filter, bool test) { struct udev_list_entry *entry; int n = 0; @@ -37,6 +39,9 @@ int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *modalias, bool 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) + continue; + if (udev_builtin_add_property(dev, test, udev_list_entry_get_name(entry), udev_list_entry_get_value(entry)) < 0) @@ -66,12 +71,13 @@ static const char *modalias_usb(struct udev_device *dev, char *s, size_t size) { return s; } -static int udev_builtin_hwdb_search(struct udev_device *dev, const char *subsystem, bool test) { +static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device *srcdev, + const char *subsystem, const char *filter, bool test) { struct udev_device *d; char s[16]; int n = 0; - for (d = dev; d; d = udev_device_get_parent(d)) { + for (d = srcdev; d; d = udev_device_get_parent(d)) { const char *dsubsys; const char *modalias = NULL; @@ -85,14 +91,15 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, const char *subsyst /* the usb_device does not have a modalias, compose one */ if (streq(dsubsys, "usb")) - modalias = modalias_usb(dev, s, sizeof(s)); + modalias = modalias_usb(d, s, sizeof(s)); if (!modalias) modalias = udev_device_get_property_value(d, "MODALIAS"); if (!modalias) continue; - n = udev_builtin_hwdb_lookup(dev, modalias, test); + + n = udev_builtin_hwdb_lookup(dev, modalias, filter, test); if (n > 0) break; } @@ -102,10 +109,15 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, const char *subsyst 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' }, {} }; + const char *filter = NULL; + const char *device = NULL; const char *subsystem = NULL; + struct udev_device *srcdev; if (!hwdb) return EXIT_FAILURE; @@ -118,13 +130,29 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te break; switch (option) { + case 'f': + filter = optarg; + break; + + case 'd': + device = optarg; + break; + case 's': subsystem = optarg; break; } } - if (udev_builtin_hwdb_search(dev, subsystem, test) < 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; + } else + srcdev = dev; + + if (udev_builtin_hwdb_search(dev, srcdev, subsystem, filter, test) < 0) return EXIT_FAILURE; return EXIT_SUCCESS; } diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index 9c1c5feb0d..85bded5f82 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -395,7 +395,7 @@ static int ieee_oui(struct udev_device *dev, struct netnames *names, bool test) snprintf(str, sizeof(str), "OUI:%02X%02X%02X%02X%02X%02X", names->mac[0], names->mac[1], names->mac[2], names->mac[3], names->mac[4], names->mac[5]); - udev_builtin_hwdb_lookup(dev, str, test); + udev_builtin_hwdb_lookup(dev, str, NULL, test); return 0; } diff --git a/src/udev/udev.h b/src/udev/udev.h index 8e1726c543..cba30cd14c 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -186,7 +186,7 @@ int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c void udev_builtin_list(struct udev *udev); bool udev_builtin_validate(struct udev *udev); int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val); -int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *modalias, bool test); +int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *modalias, const char *filter, bool test); /* udev logging */ void udev_main_log(struct udev *udev, int priority, |