X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev.h;h=102f15d0b9bf94b1cd8dc3ab44ec2d8c767e9c0c;hb=b03e89cfbaa1fdd0c32bbd54f2b450e17014b522;hp=700c8c09d8fe1d153df2f865eed2fb34d156f8b9;hpb=4f4b12c20388ff2cb158b040e3193f86cf7a3b96;p=elogind.git diff --git a/udev/udev.h b/udev/udev.h index 700c8c09d..102f15d0b 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -2,40 +2,31 @@ * Copyright (C) 2003 Greg Kroah-Hartman * Copyright (C) 2003-2008 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 the - * Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * 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 + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #ifndef _UDEV_H_ #define _UDEV_H_ -#include "config.h" - #include #include -#include "list.h" #include "udev_sysdeps.h" #define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE 1 #include "lib/libudev.h" #include "lib/libudev-private.h" - -#define COMMENT_CHARACTER '#' -#define LINE_SIZE 512 -#define PATH_SIZE 512 -#define NAME_SIZE 256 -#define VALUE_SIZE 128 +#include "list.h" #define ALLOWED_CHARS "#+-.:=@_" #define ALLOWED_CHARS_FILE ALLOWED_CHARS "/" @@ -61,11 +52,11 @@ struct udev_rules; struct sysfs_device { struct list_head node; /* for device cache */ struct sysfs_device *parent; /* already cached parent*/ - char devpath[PATH_SIZE]; - char subsystem[NAME_SIZE]; /* $class, $bus, drivers, module */ - char kernel[NAME_SIZE]; /* device instance name */ - char kernel_number[NAME_SIZE]; - char driver[NAME_SIZE]; /* device driver name */ + char devpath[UTIL_PATH_SIZE]; + char subsystem[UTIL_NAME_SIZE]; + char kernel[UTIL_NAME_SIZE]; /* device instance name */ + char kernel_number[UTIL_NAME_SIZE]; + char driver[UTIL_NAME_SIZE]; }; struct udevice { @@ -75,16 +66,16 @@ struct udevice { struct sysfs_device *dev; /* points to dev_local by default */ struct sysfs_device dev_local; struct sysfs_device *dev_parent; /* current parent device used for matching */ - char action[NAME_SIZE]; + char action[UTIL_NAME_SIZE]; char *devpath_old; /* node */ - char name[PATH_SIZE]; + char name[UTIL_PATH_SIZE]; struct list_head symlink_list; int symlink_final; - char owner[NAME_SIZE]; + char owner[UTIL_NAME_SIZE]; int owner_final; - char group[NAME_SIZE]; + char group[UTIL_NAME_SIZE]; int group_final; mode_t mode; int mode_final; @@ -94,11 +85,11 @@ struct udevice { struct list_head run_list; int run_final; struct list_head env_list; - char tmp_node[PATH_SIZE]; + char tmp_node[UTIL_PATH_SIZE]; int partitions; int ignore_device; int ignore_remove; - char program_result[PATH_SIZE]; + char program_result[UTIL_PATH_SIZE]; int link_priority; int event_timeout; int test_run; @@ -139,7 +130,6 @@ extern struct sysfs_device *sysfs_device_get(struct udev *udev, const char *devp extern struct sysfs_device *sysfs_device_get_parent(struct udev *udev, struct sysfs_device *dev); extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct udev *udev, struct sysfs_device *dev, const char *subsystem); extern char *sysfs_attr_get_value(struct udev *udev, const char *devpath, const char *attr_name); -extern int sysfs_resolve_link(struct udev *udev, char *path, size_t size); extern int sysfs_lookup_devpath_by_subsys_id(struct udev *udev, char *devpath, size_t len, const char *subsystem, const char *id); /* udev_node.c */ @@ -154,16 +144,13 @@ extern int udev_db_delete_device(struct udevice *udevice); extern int udev_db_rename(struct udev *udev, const char *devpath_old, const char *devpath); extern int udev_db_get_device(struct udevice *udevice, const char *devpath); extern int udev_db_get_devices_by_name(struct udev *udev, const char *name, struct list_head *name_list); -extern int udev_db_get_all_entries(struct udev *udevconst, struct list_head *name_list); /* udev_utils.c */ struct name_entry { struct list_head node; - char name[PATH_SIZE]; + char name[UTIL_PATH_SIZE]; unsigned int ignore_error:1; }; - -extern int log_priority(const char *priority); 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); @@ -172,14 +159,6 @@ extern int add_matching_files(struct udev *udev, struct list_head *name_list, co extern uid_t lookup_user(struct udev *udev, const char *user); extern gid_t lookup_group(struct udev *udev, const char *group); -/* udev_utils_string.c */ -extern int string_is_true(const char *str); -extern void remove_trailing_chars(char *path, char c); -extern size_t path_encode(char *s, size_t len); -extern size_t path_decode(char *s); -extern int utf8_encoded_valid_unichar(const char *str); -extern int replace_chars(char *str, const char *white); - /* udev_utils_file.c */ extern int create_path(struct udev *udev, const char *path); extern int delete_path(struct udev *udev, const char *path);