X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev%2Fudev.h;h=16a029e4860ee4c7ef698755b7ad4ddc280ba067;hb=c7c32e9c9835a0bdaee931f33ac0fc86a1e4c415;hp=2b9bbecc8efc87d89c4b36692110a2dafb7ff27e;hpb=0ec5b5e1429307fa7573aaa9b8f25fbd9b1d71d5;p=elogind.git

diff --git a/udev/udev.h b/udev/udev.h
index 2b9bbecc8..16a029e48 100644
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -26,9 +26,6 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
-#define DEFAULT_FAKE_PARTITIONS_COUNT		15
-#define UDEV_EVENT_TIMEOUT			180
-
 #define UDEV_CTRL_SOCK_PATH			"@/org/kernel/udev/udevd"
 
 struct udev_event {
@@ -43,13 +40,19 @@ struct udev_event {
 	uid_t uid;
 	gid_t gid;
 	struct udev_list_node run_list;
-	unsigned int group_final:1;
-	unsigned int owner_final:1;
-	unsigned int mode_final:1;
-	unsigned int name_final:1;
-	unsigned int devlink_final:1;
-	unsigned int run_final:1;
-	unsigned int inotify_watch:1;
+	int exec_delay;
+	unsigned long long birth_usec;
+	unsigned long long timeout_usec;
+	int fd_signal;
+	bool sigterm;
+	bool inotify_watch;
+	bool inotify_watch_final;
+	bool group_final;
+	bool owner_final;
+	bool mode_final;
+	bool name_final;
+	bool devlink_final;
+	bool run_final;
 };
 
 struct udev_watch {
@@ -62,16 +65,20 @@ struct udev_watch {
 struct udev_rules;
 struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
 void udev_rules_unref(struct udev_rules *rules);
-int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event);
+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);
 
 /* udev-event.c */
 struct udev_event *udev_event_new(struct udev_device *dev);
 void udev_event_unref(struct udev_event *event);
-int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
-int udev_event_execute_run(struct udev_event *event, const sigset_t *sigset);
 size_t udev_event_apply_format(struct udev_event *event, const char *src, char *dest, size_t size);
 int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
 				   char *result, size_t maxsize, int read_value);
+int udev_event_spawn(struct udev_event *event,
+		     const char *cmd, char **envp, const sigset_t *sigmask,
+		     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);
 
 /* udev-watch.c */
 int udev_watch_init(struct udev *udev);
@@ -81,7 +88,7 @@ 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, dev_t devnum, mode_t mode, uid_t uid, gid_t gid);
+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);