X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev.h;h=8f2c1c63dda66965ed11cc2cf218fb1677802134;hb=e91ac78ffc62a7a4f10fc66ed492e5b67a11448a;hp=927ff36e0116bdcdd45338d091085a51fe7f1b61;hpb=40fd3bc837e04538df305b512157e55a2a5e0789;p=elogind.git

diff --git a/udev/udev.h b/udev/udev.h
index 927ff36e0..8f2c1c63d 100644
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -26,10 +26,6 @@
 #include "lib/libudev.h"
 #include "lib/libudev-private.h"
 
-#define ALLOWED_CHARS				"#+-.:=@_"
-#define ALLOWED_CHARS_FILE			ALLOWED_CHARS "/"
-#define ALLOWED_CHARS_INPUT			ALLOWED_CHARS_FILE " $%?,"
-
 #define DEFAULT_FAKE_PARTITIONS_COUNT		15
 #define UDEV_EVENT_TIMEOUT			180
 
@@ -57,62 +53,76 @@ static inline void logging_close(void)
 }
 
 struct udev_event {
+	struct udev_list_node node;
 	struct udev *udev;
 	struct udev_device *dev;
 	struct udev_device *dev_parent;
-	int devlink_final;
-	char name[UTIL_PATH_SIZE];
-	int name_final;
-	int name_ignore;
+	char *name;
 	char *tmp_node;
 	char *program_result;
 	mode_t mode;
-	int mode_final;
 	uid_t uid;
-	int owner_final;
 	gid_t gid;
-	int group_final;
 	struct udev_list_node run_list;
-	int run_final;
-	int ignore_device;
-	int test;
-
-	struct udev_list_node node;
 	pid_t pid;
 	int exitstatus;
 	time_t queue_time;
+	unsigned long long int delaying_seqnum;
+	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 ignore_device:1;
+	unsigned int inotify_watch:1;
+	unsigned int trace:1;
+};
+
+struct udev_watch {
+	struct udev_list_node node;
+	int handle;
+	char *name;
 };
 
 /* udev-rules.c */
 struct udev_rules;
-extern struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
-extern void udev_rules_unref(struct udev_rules *rules);
-extern int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event);
+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);
 
 /* udev-event.c */
-extern struct udev_event *udev_event_new(struct udev_device *dev);
-extern void udev_event_unref(struct udev_event *event);
-extern int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
-extern int udev_event_execute_run(struct udev_event *event);
-extern void udev_event_apply_format(struct udev_event *event, char *string, size_t maxsize);
-extern int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
-					  char *result, size_t maxsize, int read_value);
+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);
+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);
+
+/* udev-watch.c */
+extern int inotify_fd;
+void udev_watch_init(struct udev *udev);
+void udev_watch_restore(struct udev *udev);
+void udev_watch_begin(struct udev *udev, struct udev_device *dev);
+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 */
-extern int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid);
-extern int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid, int test);
-extern int udev_node_remove(struct udev_device *dev, int test);
-extern void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old, int test);
+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_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-util.c */
-extern int util_create_path(struct udev *udev, const char *path);
-extern int util_delete_path(struct udev *udev, const char *path);
-extern int util_unlink_secure(struct udev *udev, const char *filename);
-extern uid_t util_lookup_user(struct udev *udev, const char *user);
-extern gid_t util_lookup_group(struct udev *udev, const char *group);
-extern int util_run_program(struct udev *udev, const char *command, char **envp,
-			    char *result, size_t ressize, size_t *reslen);
-extern int util_resolve_subsys_kernel(struct udev *udev, const char *string,
+int util_create_path(struct udev *udev, const char *path);
+int util_delete_path(struct udev *udev, const char *path);
+int util_unlink_secure(struct udev *udev, const char *filename);
+uid_t util_lookup_user(struct udev *udev, const char *user);
+gid_t util_lookup_group(struct udev *udev, const char *group);
+int util_run_program(struct udev *udev, const char *command, char **envp,
+		     char *result, size_t ressize, size_t *reslen);
+int util_resolve_subsys_kernel(struct udev *udev, const char *string,
 				      char *result, size_t maxsize, int read_value);
 
 /* udev-selinux.c */
@@ -123,18 +133,18 @@ static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file,
 static inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {}
 static inline void udev_selinux_resetfscreatecon(struct udev *udev) {}
 #else
-extern void udev_selinux_init(struct udev *udev);
-extern void udev_selinux_exit(struct udev *udev);
-extern void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
-extern void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
-extern void udev_selinux_resetfscreatecon(struct udev *udev);
+void udev_selinux_init(struct udev *udev);
+void udev_selinux_exit(struct udev *udev);
+void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
+void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
+void udev_selinux_resetfscreatecon(struct udev *udev);
 #endif
 
 /* udevadm commands */
-extern int udevadm_monitor(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_info(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_control(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_trigger(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_settle(struct udev *udev, int argc, char *argv[]);
-extern int udevadm_test(struct udev *udev, int argc, char *argv[]);
+int udevadm_monitor(struct udev *udev, int argc, char *argv[]);
+int udevadm_info(struct udev *udev, int argc, char *argv[]);
+int udevadm_control(struct udev *udev, int argc, char *argv[]);
+int udevadm_trigger(struct udev *udev, int argc, char *argv[]);
+int udevadm_settle(struct udev *udev, int argc, char *argv[]);
+int udevadm_test(struct udev *udev, int argc, char *argv[]);
 #endif