X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev.h;h=d0ffb6cb3119f9fe9d8c4aab3feb34e4bb0f25b4;hb=dcdcb8cc06c044a0429a688266799838e914f88d;hp=e5c7cd192f7b431c4b5c56e10b232ac91b209523;hpb=a390e6f764087b74b1567e1daf1f1c41eae42c74;p=elogind.git

diff --git a/udev/udev.h b/udev/udev.h
index e5c7cd192..d0ffb6cb3 100644
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -25,13 +25,12 @@
 #include "udev-sysdeps.h"
 #include "lib/libudev.h"
 #include "lib/libudev-private.h"
-#include "list.h"
 
 #define ALLOWED_CHARS				"#+-.:=@_"
 #define ALLOWED_CHARS_FILE			ALLOWED_CHARS "/"
 #define ALLOWED_CHARS_INPUT			ALLOWED_CHARS_FILE " $%?,"
 
-#define DEFAULT_PARTITIONS_COUNT		15
+#define DEFAULT_FAKE_PARTITIONS_COUNT		15
 #define UDEV_EVENT_TIMEOUT			180
 
 /* linux/include/linux/kobject.h */
@@ -41,13 +40,9 @@
 #define UDEV_CTRL_SOCK_PATH			"@" UDEV_PREFIX "/org/kernel/udev/udevd"
 
 #define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
-
-/* pipes */
 #define READ_END				0
 #define WRITE_END				1
 
-struct udev_rules;
-
 static inline void logging_init(const char *program_name)
 {
 	openlog(program_name, LOG_PID | LOG_CONS, LOG_DAEMON);
@@ -86,14 +81,23 @@ struct udev_event {
 	int ignore_device;
 	int test;
 
-	struct list_head node;
+	struct udev_list_node node;
 	pid_t pid;
 	int exitstatus;
 	time_t queue_time;
 };
+struct udev_rules;
 extern struct udev_event *udev_event_new(struct udev_device *dev);
 extern void udev_event_unref(struct udev_event *event);
-extern int udev_event_run(struct udev_event *event, struct udev_rules *rules);
+extern int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
+
+/* udev-rules.c */
+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_run(struct udev_event *event);
+extern void udev_rules_apply_format(struct udev_event *event, char *string, size_t maxsize);
 
 /* 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);
@@ -107,6 +111,8 @@ extern int delete_path(struct udev *udev, const char *path);
 extern int unlink_secure(struct udev *udev, const char *filename);
 extern uid_t lookup_user(struct udev *udev, const char *user);
 extern gid_t lookup_group(struct udev *udev, const char *group);
+extern int run_program(struct udev *udev, const char *command, char **envp,
+		       char *result, size_t ressize, size_t *reslen);
 
 /* udev_utils_file.c */
 extern int file_map(const char *filename, char **buf, size_t *bufsize);