X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev.h;h=66ad73ad92dac868b522b802b78df21a320f9526;hp=896a466762ea89908982830a74cb0e8b2e888abe;hb=c3b1fa66d2685780e60e4c5b8bc0c2e717c1ee71;hpb=aa8734ffcb8a895fc8d66ff383cbcf8f4b78f562 diff --git a/udev/udev.h b/udev/udev.h index 896a46676..66ad73ad9 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -22,16 +22,15 @@ #include #include -#include "udev_sysdeps.h" +#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); @@ -65,7 +60,6 @@ static inline void logging_close(void) closelog(); } -/* udev-event.c */ struct udev_event { struct udev *udev; struct udev_device *dev; @@ -86,14 +80,27 @@ 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; }; + +/* 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); + +/* 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); @@ -101,43 +108,25 @@ extern int udev_node_add(struct udev_device *dev, mode_t mode, const char *owner 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); -/* udev-device-db.c */ -extern int udev_device_update_db(struct udev_device *udev_device); -extern int udev_device_delete_db(struct udev_device *udev_device); -extern int udev_device_rename_db(struct udev_device *udev_device, const char *devpath); - /* udev-util.c */ -struct name_entry { - struct list_head node; - char name[UTIL_PATH_SIZE]; - unsigned int ignore_error:1; -}; -extern struct name_entry *name_list_add(struct udev *udev, struct list_head *name_list, const char *name, int sort); -extern struct name_entry *name_list_key_add(struct udev *udev, struct list_head *name_list, const char *key, const char *value); -extern int name_list_key_remove(struct udev *udev, struct list_head *name_list, const char *key); -extern void name_list_cleanup(struct udev *udev, struct list_head *name_list); -extern int add_matching_files(struct udev *udev, struct list_head *name_list, const char *dirname, const char *suffix); -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 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 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 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-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);