X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev.h;h=d5fa4f3edc9f96863fce1316ba840d5595782561;hb=047f88bca31f364253fe230a1c2ec7fbc43c7fc3;hp=732b1313900f70903cd5925b674eeb1e6db4126b;hpb=0bc74ea79f68a89c5ec4bf5676dede97626ceade;p=elogind.git

diff --git a/udev/udev.h b/udev/udev.h
index 732b13139..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
 
@@ -79,8 +75,14 @@ struct udev_event {
 	unsigned int devlink_final:1;
 	unsigned int run_final:1;
 	unsigned int ignore_device:1;
+	unsigned int inotify_watch:1;
 	unsigned int trace:1;
-	unsigned int test:1;
+};
+
+struct udev_watch {
+	struct udev_list_node node;
+	int handle;
+	char *name;
 };
 
 /* udev-rules.c */
@@ -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, 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);
+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);