X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=16a107a33d8b89ff56acb3414b7b12a788be4800;hb=31de3a2ba18ffa011f5054016ccc4a500cbe0cc3;hp=389966986871bd7f39fea230b7a4b077ae4b12cc;hpb=27b77df44daebbd7597c572343105c16de099233;p=elogind.git

diff --git a/udev.h b/udev.h
index 389966986..16a107a33 100644
--- a/udev.h
+++ b/udev.h
@@ -29,7 +29,6 @@
 #include "udev_version.h"
 
 #define COMMENT_CHARACTER			'#'
-#define PATH_TO_NAME_CHAR			'@'
 #define LINE_SIZE				512
 #define PATH_SIZE				512
 #define NAME_SIZE				128
@@ -45,6 +44,7 @@
 #define WRITE_END				1
 
 #define DB_DIR					".udev/db"
+#define DB_NAME_INDEX_DIR			".udev/names"
 
 struct udev_rules;
 
@@ -86,19 +86,20 @@ struct udevice {
 	int ignore_device;
 	int ignore_remove;
 	char program_result[PATH_SIZE];
+	int link_priority;
 	int test_run;
 };
 
 /* udev_config.c */
 extern char udev_root[PATH_SIZE];
 extern char udev_config_filename[PATH_SIZE];
-extern char udev_rules_filename[PATH_SIZE];
+extern char udev_rules_dir[PATH_SIZE];
 extern int udev_log_priority;
 extern int udev_run;
 extern void udev_config_init(void);
 
 /* udev_device.c */
-extern struct udevice *udev_device_init(void);
+extern struct udevice *udev_device_init(struct udevice *udev);
 extern void udev_device_cleanup(struct udevice *udev);
 extern int udev_device_event(struct udev_rules *rules, struct udevice *udev);
 extern dev_t udev_device_get_devt(struct udevice *udev);
@@ -113,6 +114,7 @@ extern struct sysfs_device *sysfs_device_get(const char *devpath);
 extern struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev);
 extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem);
 extern char *sysfs_attr_get_value(const char *devpath, const char *attr_name);
+extern int sysfs_resolve_link(char *path, size_t size);
 
 /* udev_node.c */
 extern int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
@@ -125,6 +127,7 @@ extern int udev_db_add_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_lookup_name(const char *name, char *devpath, size_t len);
+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);
 
 /* udev_utils.c */
@@ -143,6 +146,8 @@ extern gid_t lookup_group(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_untrusted_chars(char *str);