X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev.h;h=6833e60d616e4037f54b5037725f3ecee805143f;hp=a00be373344f3cd67c5da65c25010a953322f731;hb=2d74bc75792bdd993e6298cf253541624001517c;hpb=6880b25d4044f2d154908f88e717435412187355 diff --git a/udev/udev.h b/udev/udev.h index a00be3733..6833e60d6 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2003 Greg Kroah-Hartman - * Copyright (C) 2003-2008 Kay Sievers + * Copyright (C) 2003-2010 Kay Sievers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,120 +21,79 @@ #include #include +#include -#include "udev-sysdeps.h" -#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 " $%?," +#include "libudev.h" +#include "libudev-private.h" #define DEFAULT_FAKE_PARTITIONS_COUNT 15 #define UDEV_EVENT_TIMEOUT 180 -#define UDEV_CTRL_SOCK_PATH "@" UDEV_PREFIX "/org/kernel/udev/udevd" - -#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b)) -#define READ_END 0 -#define WRITE_END 1 - -static inline void logging_init(const char *program_name) -{ - openlog(program_name, LOG_PID | LOG_CONS, LOG_DAEMON); -} - -static inline void logging_msg(struct udev *udev, int priority, - const char *file, int line, const char *fn, - const char *format, va_list args) -{ - vsyslog(priority, format, args); -} - -static inline void logging_close(void) -{ - closelog(); -} +#define UDEV_CTRL_SOCK_PATH "@/org/kernel/udev/udevd" struct udev_event { struct udev *udev; struct udev_device *dev; struct udev_device *dev_parent; - int devlink_final; - char program_result[UTIL_PATH_SIZE]; - char name[UTIL_PATH_SIZE]; - int name_final; - int name_ignore; - char tmp_node[UTIL_PATH_SIZE]; + struct udev_device *dev_db; + char *name; + char *tmp_node; + char *program_result; mode_t mode; - int mode_final; uid_t uid; - int owner_final; gid_t gid; - int group_final; struct udev_list_node run_list; - int run_final; - int ignore_device; - int test; + int exec_delay; + bool inotify_watch; + bool inotify_watch_final; + bool group_final; + bool owner_final; + bool mode_final; + bool name_final; + bool devlink_final; + bool run_final; +}; +struct udev_watch { struct udev_list_node node; - pid_t pid; - int exitstatus; - time_t queue_time; + int handle; + char *name; }; /* 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); +struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names); +void udev_rules_unref(struct udev_rules *rules); +int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event); +void udev_rules_apply_static_dev_perms(struct udev_rules *rules); /* 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_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); +struct udev_event *udev_event_new(struct udev_device *dev); +void udev_event_unref(struct udev_event *event); +int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules); +int udev_event_execute_run(struct udev_event *event, const sigset_t *sigset); +size_t udev_event_apply_format(struct udev_event *event, const char *src, char *dest, size_t size); +int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string, + char *result, size_t maxsize, int read_value); + +/* udev-watch.c */ +int udev_watch_init(struct udev *udev); +void udev_watch_restore(struct udev *udev); +void udev_watch_begin(struct udev *udev, struct udev_device *dev); +void udev_watch_end(struct udev *udev, struct udev_device *dev); +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); - -/* udev-util.c */ -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 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 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); -#endif +int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_t uid, gid_t gid); +int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid); +int udev_node_remove(struct udev_device *dev); +void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old); /* udevadm commands */ -extern int udevadm_monitor(struct udev *udev, int argc, char *argv[]); -extern int udevadm_info(struct udev *udev, int argc, char *argv[]); -extern int udevadm_control(struct udev *udev, int argc, char *argv[]); -extern int udevadm_trigger(struct udev *udev, int argc, char *argv[]); -extern int udevadm_settle(struct udev *udev, int argc, char *argv[]); -extern int udevadm_test(struct udev *udev, int argc, char *argv[]); +int udevadm_monitor(struct udev *udev, int argc, char *argv[]); +int udevadm_info(struct udev *udev, int argc, char *argv[]); +int udevadm_control(struct udev *udev, int argc, char *argv[]); +int udevadm_trigger(struct udev *udev, int argc, char *argv[]); +int udevadm_settle(struct udev *udev, int argc, char *argv[]); +int udevadm_test(struct udev *udev, int argc, char *argv[]); #endif