hwdb: add --lookup-prefix= option

diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index 36958916c46185ebbf29476d64e0a8c26f0099a7..314587f2bb2fbf1c0800198d4fd433af93dbf7dc 100644 (file)
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -31,14 +31,26 @@
 static struct udev_hwdb *hwdb;
 
 int udev_builtin_hwdb_lookup(struct udev_device *dev,
 static struct udev_hwdb *hwdb;
 
 int udev_builtin_hwdb_lookup(struct udev_device *dev,

-                             const char *modalias, const char *filter, bool test) {
+                             const char *prefix, const char *modalias,
+                             const char *filter, bool test) {
+        struct udev_list_entry *list;

         struct udev_list_entry *entry;
         int n = 0;
 
         if (!hwdb)
                 return -ENOENT;
 
         struct udev_list_entry *entry;
         int n = 0;
 
         if (!hwdb)
                 return -ENOENT;
 

-        udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, modalias, 0)) {
+        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);
+
+        udev_list_entry_foreach(entry, list) {

                 if (filter && fnmatch(filter, udev_list_entry_get_name(entry), FNM_NOESCAPE) != 0)
                         continue;
 
                 if (filter && fnmatch(filter, udev_list_entry_get_name(entry), FNM_NOESCAPE) != 0)
                         continue;
 


@@ -72,7 +84,8 @@ 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,
 }
 
 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;
         struct udev_device *d;
         char s[16];
         int n = 0;


@@ -99,7 +112,7 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device
                 if (!modalias)
                         continue;
 
                 if (!modalias)
                         continue;
 

-                n = udev_builtin_hwdb_lookup(dev, modalias, filter, test);
+                n = udev_builtin_hwdb_lookup(dev, prefix, modalias, filter, test);

                 if (n > 0)
                         break;
         }
                 if (n > 0)
                         break;
         }


@@ -112,11 +125,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' },
                 { "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 *filter = NULL;
         const char *device = NULL;
         const char *subsystem = NULL;

+        const char *prefix = NULL;

         struct udev_device *srcdev;
 
         if (!hwdb)
         struct udev_device *srcdev;
 
         if (!hwdb)


@@ -125,7 +140,7 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te
         for (;;) {
                 int option;
 
         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;
 
                 if (option == -1)
                         break;
 


@@ -141,12 +156,16 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te
                 case 's':
                         subsystem = optarg;
                         break;
                 case 's':
                         subsystem = optarg;
                         break;

+
+                case 'p':
+                        prefix = optarg;
+                        break;

                 }
         }
 
         /* query a specific key given as argument */
         if (argv[optind]) {
                 }
         }
 
         /* 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;
         }
                         return EXIT_SUCCESS;
                 return EXIT_FAILURE;
         }


@@ -159,7 +178,7 @@ static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te
         } else
                 srcdev = dev;
 
         } else
                 srcdev = dev;
 

-        if (udev_builtin_hwdb_search(dev, srcdev, subsystem, filter, test) < 0)
+        if (udev_builtin_hwdb_search(dev, srcdev, subsystem, prefix, filter, test) < 0)

                 return EXIT_FAILURE;
         return EXIT_SUCCESS;
 }
                 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 e1d808712229e7e2027ac59769b350a47dc59d7a..9ae8f08ccfea19fa721bddc8ca552e61268bf489 100644 (file)
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -396,7 +396,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]);
         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, NULL, test);
+        udev_builtin_hwdb_lookup(dev, NULL, str, NULL, test);

         return 0;
 }
 
         return 0;
 }
 

diff --git a/src/udev/udev.h b/src/udev/udev.h
index d5f8cd7dcf2325a3a16b1577e852da76ecbb1622..4f10c452e65cc6bb14997c45dce9d30d0266a5b3 100644 (file)
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -190,7 +190,8 @@ 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);
 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, const char *filter, bool test);
+int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *prefix, const char *modalias,
+                             const char *filter, bool test);

 
 /* udev logging */
 void udev_main_log(struct udev *udev, int priority,
 
 /* udev logging */
 void udev_main_log(struct udev *udev, int priority,