X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev.h;h=faa1bf68516cb6737c4f8069bcd8008101aba58c;hp=217e942c18fddb05f806b1ef79df11fb7b7df6bb;hb=b99028c96307e729303be8f6750418979a7488b9;hpb=14f4025607e905cb230c6e5b32488e9f2d07a0d2 diff --git a/udev/udev.h b/udev/udev.h index 217e942c1..faa1bf685 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -57,37 +57,35 @@ 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 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 test: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_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); @@ -100,7 +98,7 @@ extern int udev_event_apply_subsys_kernel(struct udev_event *event, const char * /* 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_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);