X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-builtin.c;h=9f2172769938be02ac061031c0d0da569fb80df0;hp=eeec6e990defb983c27d9f94e50794ac163bfc25;hb=aa29418a13dc1e1eedca702663e733cc8d9f9859;hpb=d7867b31836173d1a943ecb1cab6484536126411

diff --git a/udev/udev-builtin.c b/udev/udev-builtin.c
index eeec6e990..9f2172769 100644
--- a/udev/udev-builtin.c
+++ b/udev/udev-builtin.c
@@ -29,8 +29,30 @@ 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_KMOD] = &udev_builtin_kmod,
 };
 
+int udev_builtin_load(struct udev *udev)
+{
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(builtins); i++)
+		if (builtins[i]->load)
+			builtins[i]->load(udev);
+	return 0;
+}
+
+int udev_builtin_unload(struct udev *udev)
+{
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(builtins); i++)
+		if (builtins[i]->unload)
+			builtins[i]->unload(udev);
+	return 0;
+}
+
 int udev_builtin_list(struct udev *udev)
 {
 	unsigned int i;
@@ -45,19 +67,30 @@ const char *udev_builtin_name(enum udev_builtin_cmd cmd)
 	return builtins[cmd]->name;
 }
 
-enum udev_builtin_cmd udev_builtin_lookup(const char *name)
+bool udev_builtin_run_once(enum udev_builtin_cmd cmd)
+{
+	return builtins[cmd]->run_once;
+}
+
+enum udev_builtin_cmd udev_builtin_lookup(const char *command)
 {
+	char name[UTIL_PATH_SIZE];
 	enum udev_builtin_cmd i;
+	char *pos;
 
+	util_strscpy(name, sizeof(name), command);
+	pos = strchr(name, ' ');
+	if (pos)
+		pos[0] = '\0';
 	for (i = 0; i < ARRAY_SIZE(builtins); i++)
 		if (strcmp(builtins[i]->name, name) == 0)
 			return i;
 	return UDEV_BUILTIN_MAX;
 }
 
-int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, bool test)
+int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test)
 {
-	return builtins[cmd]->cmd(dev, test);
+	return builtins[cmd]->cmd(dev, command, test);
 }
 
 int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val, ...)