X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev.h;h=d5fa4f3edc9f96863fce1316ba840d5595782561;hb=b44b7f884136e1ef4452818ed514a5d7e51567f1;hp=89f6f11edfd1b1262b5dae3f42f46dbb028b590b;hpb=54808d77a3a62172fc6acbeec968be67c207509e;p=elogind.git

diff --git a/udev/udev.h b/udev/udev.h
index 89f6f11ed..d5fa4f3ed 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,37 +53,43 @@ 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;
-	int owner_final;
-	int group_final;
-	int mode_final;
-	char tmp_node[UTIL_PATH_SIZE];
-	char program_result[UTIL_PATH_SIZE];
-	int run_final;
-
-	char name[UTIL_PATH_SIZE];
+	char *name;
+	char *tmp_node;
+	char *program_result;
 	mode_t mode;
-	char owner[UTIL_NAME_SIZE];
-	char group[UTIL_NAME_SIZE];
+	uid_t uid;
+	gid_t gid;
 	struct udev_list_node run_list;
-	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_get_name(struct udev_rules *rules, struct udev_event *event);
-extern int udev_rules_get_run(struct udev_rules *rules, struct udev_event *event);
+extern 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);
@@ -98,11 +100,19 @@ extern void udev_event_apply_format(struct udev_event *event, char *string, size
 extern 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;
+extern void udev_watch_init(struct udev *udev);
+extern void udev_watch_restore(struct udev *udev);
+extern void udev_watch_begin(struct udev *udev, struct udev_device *dev);
+extern void udev_watch_end(struct udev *udev, struct udev_device *dev);
+extern 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, const char *owner, const char *group, 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);
+extern int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
+extern int udev_node_remove(struct udev_device *dev);
+extern 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);
@@ -112,6 +122,8 @@ 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,
+				      char *result, size_t maxsize, int read_value);
 
 /* udev-selinux.c */
 #ifndef USE_SELINUX