builtin: rename load()/unload() to init()/exit()

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

diff --git a/udev/udev-builtin.c b/udev/udev-builtin.c
index 9f2172769938be02ac061031c0d0da569fb80df0..baf09b91b9c61c86af9838dea34d3b603edea68c 100644 (file)
--- a/udev/udev-builtin.c
+++ b/udev/udev-builtin.c
@@ -33,23 +33,23 @@ static const struct udev_builtin *builtins[] = {
        [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
 };
 
-int udev_builtin_load(struct udev *udev)
+int udev_builtin_init(struct udev *udev)
 {
        unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(builtins); i++)
-               if (builtins[i]->load)
-                       builtins[i]->load(udev);
+               if (builtins[i]->init)
+                       builtins[i]->init(udev);
        return 0;
 }
 
-int udev_builtin_unload(struct udev *udev)
+int udev_builtin_exit(struct udev *udev)
 {
        unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(builtins); i++)
-               if (builtins[i]->unload)
-                       builtins[i]->unload(udev);
+               if (builtins[i]->exit)
+                       builtins[i]->exit(udev);
        return 0;
 }
 
@@ -90,10 +90,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;