X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev.h;h=56b1652c747cee9d3e0a3cbbe41bd79fbfdb318b;hp=0c73b502cb60f885336ef05e970532b2015de6d3;hb=220893b3cbdbf8932f95c44811b169a8f0d33939;hpb=1985c76e48753c200b5a15630b00245c3f60775b

diff --git a/udev/udev.h b/udev/udev.h
index 0c73b502c..56b1652c7 100644
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -26,24 +26,23 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
-#define UDEV_CTRL_SOCK_PATH			"@/org/kernel/udev/udevd"
-
 struct udev_event {
 	struct udev *udev;
 	struct udev_device *dev;
 	struct udev_device *dev_parent;
 	struct udev_device *dev_db;
 	char *name;
-	char *tmp_node;
 	char *program_result;
 	mode_t mode;
 	uid_t uid;
 	gid_t gid;
-	struct udev_list_node run_list;
+	struct udev_list run_list;
 	int exec_delay;
 	unsigned long long birth_usec;
 	unsigned long long timeout_usec;
 	int fd_signal;
+	unsigned int builtin_run;
+	unsigned int builtin_ret;
 	bool sigterm;
 	bool inotify_watch;
 	bool inotify_watch_final;
@@ -65,7 +64,7 @@ struct udev_watch {
 /* udev-rules.c */
 struct udev_rules;
 struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
-void udev_rules_unref(struct udev_rules *rules);
+struct udev_rules *udev_rules_unref(struct udev_rules *rules);
 int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, const sigset_t *sigmask);
 void udev_rules_apply_static_dev_perms(struct udev_rules *rules);
 
@@ -80,6 +79,7 @@ int udev_event_spawn(struct udev_event *event,
 		     char *result, size_t ressize);
 int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules, const sigset_t *sigset);
 int udev_event_execute_run(struct udev_event *event, const sigset_t *sigset);
+int udev_build_argv(struct udev *udev, char *cmd, int *argc, char *argv[]);
 
 /* udev-watch.c */
 int udev_watch_init(struct udev *udev);
@@ -89,24 +89,24 @@ void udev_watch_end(struct udev *udev, struct udev_device *dev);
 struct udev_device *udev_watch_lookup(struct udev *udev, int wd);
 
 /* udev-node.c */
-int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_t uid, gid_t gid);
 int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
 int udev_node_remove(struct udev_device *dev);
 void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
 
 /* udev-ctrl.c */
 struct udev_ctrl;
-struct udev_ctrl *udev_ctrl_new_from_socket(struct udev *udev, const char *socket_path);
-struct udev_ctrl *udev_ctrl_new_from_socket_fd(struct udev *udev, const char *socket_path, int fd);
+struct udev_ctrl *udev_ctrl_new(struct udev *udev);
+struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd);
 int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl);
 struct udev_ctrl *udev_ctrl_ref(struct udev_ctrl *uctrl);
 struct udev_ctrl *udev_ctrl_unref(struct udev_ctrl *uctrl);
+int udev_ctrl_cleanup(struct udev_ctrl *uctrl);
 struct udev *udev_ctrl_get_udev(struct udev_ctrl *uctrl);
 int udev_ctrl_get_fd(struct udev_ctrl *uctrl);
 int udev_ctrl_send_set_log_level(struct udev_ctrl *uctrl, int priority, int timeout);
 int udev_ctrl_send_stop_exec_queue(struct udev_ctrl *uctrl, int timeout);
 int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl, int timeout);
-int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl, int timeout);
+int udev_ctrl_send_reload(struct udev_ctrl *uctrl, int timeout);
 int udev_ctrl_send_ping(struct udev_ctrl *uctrl, int timeout);
 int udev_ctrl_send_exit(struct udev_ctrl *uctrl, int timeout);
 int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key, int timeout);
@@ -122,12 +122,55 @@ struct udev_ctrl_msg *udev_ctrl_msg_unref(struct udev_ctrl_msg *ctrl_msg);
 int udev_ctrl_get_set_log_level(struct udev_ctrl_msg *ctrl_msg);
 int udev_ctrl_get_stop_exec_queue(struct udev_ctrl_msg *ctrl_msg);
 int udev_ctrl_get_start_exec_queue(struct udev_ctrl_msg *ctrl_msg);
-int udev_ctrl_get_reload_rules(struct udev_ctrl_msg *ctrl_msg);
+int udev_ctrl_get_reload(struct udev_ctrl_msg *ctrl_msg);
 int udev_ctrl_get_ping(struct udev_ctrl_msg *ctrl_msg);
 int udev_ctrl_get_exit(struct udev_ctrl_msg *ctrl_msg);
 const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg);
 int udev_ctrl_get_set_children_max(struct udev_ctrl_msg *ctrl_msg);
 
+/* built-in commands */
+enum udev_builtin_cmd {
+	UDEV_BUILTIN_BLKID,
+	UDEV_BUILTIN_FIRMWARE,
+	UDEV_BUILTIN_INPUT_ID,
+	UDEV_BUILTIN_KMOD,
+	UDEV_BUILTIN_PATH_ID,
+	UDEV_BUILTIN_PCI_DB,
+	UDEV_BUILTIN_USB_DB,
+	UDEV_BUILTIN_USB_ID,
+	UDEV_BUILTIN_MAX
+};
+struct udev_builtin {
+	const char *name;
+	int (*cmd)(struct udev_device *dev, int argc, char *argv[], bool test);
+	const char *help;
+	int (*init)(struct udev *udev);
+	void (*exit)(struct udev *udev);
+	bool (*validate)(struct udev *udev);
+	bool run_once;
+};
+extern const struct udev_builtin udev_builtin_blkid;
+extern const struct udev_builtin udev_builtin_firmware;
+extern const struct udev_builtin udev_builtin_input_id;
+extern const struct udev_builtin udev_builtin_kmod;
+extern const struct udev_builtin udev_builtin_path_id;
+extern const struct udev_builtin udev_builtin_pci_db;
+extern const struct udev_builtin udev_builtin_usb_db;
+extern const struct udev_builtin udev_builtin_usb_id;
+int udev_builtin_init(struct udev *udev);
+void udev_builtin_exit(struct udev *udev);
+enum udev_builtin_cmd udev_builtin_lookup(const char *command);
+const char *udev_builtin_name(enum udev_builtin_cmd cmd);
+bool udev_builtin_run_once(enum udev_builtin_cmd cmd);
+int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test);
+void udev_builtin_list(struct udev *udev);
+int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val);
+
+/* udev logging */
+void udev_main_log(struct udev *udev, int priority,
+		   const char *file, int line, const char *fn,
+		   const char *format, va_list args);
+
 /* udevadm commands */
 struct udevadm_cmd {
 	const char *name;
@@ -135,10 +178,11 @@ struct udevadm_cmd {
 	const char *help;
 	int debug;
 };
-extern const struct udevadm_cmd udevadm_monitor;
 extern const struct udevadm_cmd udevadm_info;
-extern const struct udevadm_cmd udevadm_control;
 extern const struct udevadm_cmd udevadm_trigger;
 extern const struct udevadm_cmd udevadm_settle;
+extern const struct udevadm_cmd udevadm_control;
+extern const struct udevadm_cmd udevadm_monitor;
 extern const struct udevadm_cmd udevadm_test;
+extern const struct udevadm_cmd udevadm_test_builtin;
 #endif