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

diff --git a/udev/udev.h b/udev/udev.h
index e5c7cd192..d1b207196 100644
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -25,29 +25,16 @@
 #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 */
-#define UEVENT_BUFFER_SIZE			2048
-#define UEVENT_NUM_ENVP				32
-
 #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);
@@ -65,64 +52,74 @@ static inline void logging_close(void)
 	closelog();
 }
 
-/* udev-event.c */
 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 list_head 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 trace:1;
 };
+
+/* 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);
+
+/* 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_run(struct udev_event *event, struct udev_rules *rules);
+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);
 
 /* 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 create_path(struct udev *udev, const char *path);
-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);
-
-/* udev_utils_file.c */
-extern int file_map(const char *filename, char **buf, size_t *bufsize);
-extern void file_unmap(void *buf, size_t bufsize);
-extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
+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,
+				      char *result, size_t maxsize, int read_value);
 
 /* udev-selinux.c */
 #ifndef USE_SELINUX
-static inline void selinux_init(struct udev *udev) {}
-static inline void selinux_exit(struct udev *udev) {}
+static inline void udev_selinux_init(struct udev *udev) {}
+static inline void udev_selinux_exit(struct udev *udev) {}
 static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
 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 selinux_init(struct udev *udev);
-extern void selinux_exit(struct udev *udev);
+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);