build-sys: use --libexecdir=/usr/lib instead of /usr/lib/udev

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

diff --git a/udev/udev-builtin.c b/udev/udev-builtin.c
index 36821702c1b3193f20424fa756150efc6d696cbc..8beac8a67872676d8408fb448a103c8c5c45dcd9 100644 (file)
--- a/udev/udev-builtin.c
+++ b/udev/udev-builtin.c
@@ -26,20 +26,58 @@
 #include "udev.h"
 
 static const struct udev_builtin *builtins[] = {
-       [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
-       [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
-       [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
        [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
+       [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
+       [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
        [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
+       [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
+       [UDEV_BUILTIN_PCI_DB] = &udev_builtin_pci_db,
+       [UDEV_BUILTIN_USB_DB] = &udev_builtin_usb_db,
+       [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
 };
 
-int udev_builtin_list(struct udev *udev)
+int udev_builtin_init(struct udev *udev)
+{
+       unsigned int i;
+       int err;
+
+       for (i = 0; i < ARRAY_SIZE(builtins); i++) {
+               if (builtins[i]->init) {
+                       err = builtins[i]->init(udev);
+                       if (err < 0)
+                               break;
+               }
+       }
+       return err;
+}
+
+void udev_builtin_exit(struct udev *udev)
+{
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(builtins); i++)
+               if (builtins[i]->exit)
+                       builtins[i]->exit(udev);
+}
+
+bool udev_builtin_validate(struct udev *udev)
+{
+       unsigned int i;
+       bool change = false;
+
+       for (i = 0; i < ARRAY_SIZE(builtins); i++)
+               if (builtins[i]->validate)
+                       if (builtins[i]->validate(udev))
+                               change = true;
+       return change;
+}
+
+void udev_builtin_list(struct udev *udev)
 {
        unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(builtins); i++)
                fprintf(stderr, "  %-12s %s\n", builtins[i]->name, builtins[i]->help);
-       return 0;
 }
 
 const char *udev_builtin_name(enum udev_builtin_cmd cmd)
@@ -70,10 +108,17 @@ enum udev_builtin_cmd udev_builtin_lookup(const char *command)
 
 int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test)
 {
-       return builtins[cmd]->cmd(dev, command, test);
+       char arg[UTIL_PATH_SIZE];
+       int argc;
+       char *argv[128];
+
+       optind = 0;
+       util_strscpy(arg, sizeof(arg), command);
+       udev_build_argv(udev_device_get_udev(dev), arg, &argc, argv);
+       return builtins[cmd]->cmd(dev, argc, argv, test);
 }
 
-int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val, ...)
+int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val)
 {
        struct udev_list_entry *entry;