build argv[] for builtin commands

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index 0c73b502cb60f885336ef05e970532b2015de6d3..d5445e84e6d1dcd171e1d1776711d6163fcdbdb4 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -26,8 +26,6 @@
 #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;
@@ -39,11 +37,13 @@ struct udev_event {
        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;
@@ -51,6 +51,7 @@ struct udev_event {
        bool owner_final;
        bool mode_set;
        bool mode_final;
+       bool static_node;
        bool name_final;
        bool devlink_final;
        bool run_final;
@@ -80,6 +81,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);
@@ -96,11 +98,12 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev
 
 /* 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);
@@ -141,4 +144,36 @@ 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_test;
+extern const struct udevadm_cmd udevadm_test_builtin;
+
+/* built-in commands */
+enum udev_builtin_cmd {
+       UDEV_BUILTIN_PATH_ID,
+       UDEV_BUILTIN_USB_ID,
+       UDEV_BUILTIN_INPUT_ID,
+       UDEV_BUILTIN_BLKID,
+       UDEV_BUILTIN_KMOD,
+       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 (*load)(struct udev *udev);
+       int (*unload)(struct udev *udev);
+       bool run_once;
+};
+extern const struct udev_builtin udev_builtin_path_id;
+extern const struct udev_builtin udev_builtin_usb_id;
+extern const struct udev_builtin udev_builtin_input_id;
+extern const struct udev_builtin udev_builtin_blkid;
+extern const struct udev_builtin udev_builtin_kmod;
+int udev_builtin_load(struct udev *udev);
+int udev_builtin_unload(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);
+int udev_builtin_list(struct udev *udev);
+int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val, ...);
 #endif