| udev.h | | udev.h | |
| | | | |
| skipping to change at line 52 | | skipping to change at line 52 | |
| #define UDEV_ALARM_TIMEOUT 180 | | #define UDEV_ALARM_TIMEOUT 180 | |
| | | | |
| #define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b)) | | #define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b)) | |
| | | | |
| /* pipes */ | | /* pipes */ | |
| #define READ_END 0 | | #define READ_END 0 | |
| #define WRITE_END 1 | | #define WRITE_END 1 | |
| | | | |
| #define DB_DIR ".udev/db" | | #define DB_DIR ".udev/db" | |
| #define DB_NAME_INDEX_DIR ".udev/names" | | #define DB_NAME_INDEX_DIR ".udev/names" | |
|
| | | #define RULES_DYN_DIR ".udev/rules.d" | |
| | | | |
| struct udev_rules; | | struct udev_rules; | |
| | | | |
| struct sysfs_device { | | struct sysfs_device { | |
| struct list_head node; /* for device cache */ | | struct list_head node; /* for device cache */ | |
| struct sysfs_device *parent; /* already cached parent*/ | | struct sysfs_device *parent; /* already cached parent*/ | |
| char devpath[PATH_SIZE]; | | char devpath[PATH_SIZE]; | |
| char subsystem[NAME_SIZE]; /* $class, $bus, drivers, mo
dule */ | | char subsystem[NAME_SIZE]; /* $class, $bus, drivers, mo
dule */ | |
| char kernel[NAME_SIZE]; /* device instance name */ | | char kernel[NAME_SIZE]; /* device instance name */ | |
| char kernel_number[NAME_SIZE]; | | char kernel_number[NAME_SIZE]; | |
| | | | |
| skipping to change at line 141 | | skipping to change at line 142 | |
| extern int udev_db_add_device(struct udevice *dev); | | extern int udev_db_add_device(struct udevice *dev); | |
| extern int udev_db_delete_device(struct udevice *dev); | | extern int udev_db_delete_device(struct udevice *dev); | |
| extern int udev_db_get_device(struct udevice *udev, const char *devpath); | | extern int udev_db_get_device(struct udevice *udev, const char *devpath); | |
| extern int udev_db_get_devices_by_name(const char *name, struct list_head *
name_list); | | extern int udev_db_get_devices_by_name(const char *name, struct list_head *
name_list); | |
| extern int udev_db_get_all_entries(struct list_head *name_list); | | extern int udev_db_get_all_entries(struct list_head *name_list); | |
| | | | |
| /* udev_utils.c */ | | /* udev_utils.c */ | |
| struct name_entry { | | struct name_entry { | |
| struct list_head node; | | struct list_head node; | |
| char name[PATH_SIZE]; | | char name[PATH_SIZE]; | |
|
| | | unsigned int ignore_error:1; | |
| }; | | }; | |
|
| | | | |
| extern int log_priority(const char *priority); | | extern int log_priority(const char *priority); | |
|
| extern char *name_list_add(struct list_head *name_list, const char *name, i | | extern struct name_entry *name_list_add(struct list_head *name_list, const | |
| nt sort); | | char *name, int sort); | |
| extern char *name_list_key_add(struct list_head *name_list, const char *key | | extern struct name_entry *name_list_key_add(struct list_head *name_list, co | |
| , const char *value); | | nst char *key, const char *value); | |
| extern int name_list_key_remove(struct list_head *name_list, const char *ke
y); | | extern int name_list_key_remove(struct list_head *name_list, const char *ke
y); | |
| extern void name_list_cleanup(struct list_head *name_list); | | extern void name_list_cleanup(struct list_head *name_list); | |
| extern int add_matching_files(struct list_head *name_list, const char *dirn
ame, const char *suffix); | | extern int add_matching_files(struct list_head *name_list, const char *dirn
ame, const char *suffix); | |
| extern uid_t lookup_user(const char *user); | | extern uid_t lookup_user(const char *user); | |
| extern gid_t lookup_group(const char *group); | | extern gid_t lookup_group(const char *group); | |
| | | | |
| /* udev_utils_string.c */ | | /* udev_utils_string.c */ | |
| extern int string_is_true(const char *str); | | extern int string_is_true(const char *str); | |
| extern void remove_trailing_chars(char *path, char c); | | extern void remove_trailing_chars(char *path, char c); | |
| extern size_t path_encode(char *s, size_t len); | | extern size_t path_encode(char *s, size_t len); | |
| | | | |
| skipping to change at line 167 | | skipping to change at line 170 | |
| extern int replace_chars(char *str, const char *white); | | extern int replace_chars(char *str, const char *white); | |
| | | | |
| /* udev_utils_file.c */ | | /* udev_utils_file.c */ | |
| extern int create_path(const char *path); | | extern int create_path(const char *path); | |
| extern int delete_path(const char *path); | | extern int delete_path(const char *path); | |
| extern int file_map(const char *filename, char **buf, size_t *bufsize); | | extern int file_map(const char *filename, char **buf, size_t *bufsize); | |
| extern void file_unmap(void *buf, size_t bufsize); | | extern void file_unmap(void *buf, size_t bufsize); | |
| extern int unlink_secure(const char *filename); | | extern int unlink_secure(const char *filename); | |
| extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur); | | extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur); | |
| | | | |
|
| /* udev_utils_run.c */ | | | |
| extern int pass_env_to_socket(const char *name, const char *devpath, const | | | |
| char *action); | | | |
| extern int run_program(const char *command, const char *subsystem, | | | |
| char *result, size_t ressize, size_t *reslen, int log | | | |
| ); | | | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 5 change blocks. |
| 11 lines changed or deleted | | 7 lines changed or added | |
|
| udev_rules.h | | udev_rules.h | |
| | | | |
| skipping to change at line 93 | | skipping to change at line 93 | |
| enum import_type import_type; | | enum import_type import_type; | |
| struct key test; | | struct key test; | |
| mode_t test_mode_mask; | | mode_t test_mode_mask; | |
| struct key run; | | struct key run; | |
| struct key wait_for_sysfs; | | struct key wait_for_sysfs; | |
| struct key label; | | struct key label; | |
| struct key goto_label; | | struct key goto_label; | |
| | | | |
| struct key name; | | struct key name; | |
| struct key symlink; | | struct key symlink; | |
|
| | | struct key symlink_match; | |
| struct key owner; | | struct key owner; | |
| struct key group; | | struct key group; | |
| mode_t mode; | | mode_t mode; | |
| enum key_operation mode_operation; | | enum key_operation mode_operation; | |
| enum escape_type string_escape; | | enum escape_type string_escape; | |
| | | | |
| unsigned int link_priority; | | unsigned int link_priority; | |
| unsigned int partitions; | | unsigned int partitions; | |
| unsigned int last_rule:1, | | unsigned int last_rule:1, | |
|
| | | run_ignore_error:1, | |
| ignore_device:1, | | ignore_device:1, | |
| ignore_remove:1; | | ignore_remove:1; | |
| | | | |
| size_t bufsize; | | size_t bufsize; | |
| char buf[]; | | char buf[]; | |
| }; | | }; | |
| | | | |
| struct udev_rules { | | struct udev_rules { | |
| char *buf; | | char *buf; | |
| size_t bufsize; | | size_t bufsize; | |
| | | | |
| skipping to change at line 125 | | skipping to change at line 127 | |
| | | | |
| extern int udev_rules_init(struct udev_rules *rules, int resolve_names); | | extern int udev_rules_init(struct udev_rules *rules, int resolve_names); | |
| extern void udev_rules_cleanup(struct udev_rules *rules); | | extern void udev_rules_cleanup(struct udev_rules *rules); | |
| | | | |
| extern void udev_rules_iter_init(struct udev_rules *rules); | | extern void udev_rules_iter_init(struct udev_rules *rules); | |
| extern struct udev_rule *udev_rules_iter_next(struct udev_rules *rules); | | extern struct udev_rule *udev_rules_iter_next(struct udev_rules *rules); | |
| extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, co
nst char *label); | | extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, co
nst char *label); | |
| | | | |
| extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *ud
ev); | | extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *ud
ev); | |
| extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *ude
v); | | extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *ude
v); | |
|
| | | extern int udev_rules_run(struct udevice *udev); | |
| | | | |
| extern void udev_rules_apply_format(struct udevice *udev, char *string, siz
e_t maxsize); | | extern void udev_rules_apply_format(struct udevice *udev, char *string, siz
e_t maxsize); | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 3 change blocks. |
| 0 lines changed or deleted | | 3 lines changed or added | |
|