X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=64510ed35f8dd40d09363dd4488d31db1389421a;hb=2e23125e112c0a56e1ccee193c2cfe0e26af1bad;hp=5bd0e301c6d2681782d158b8901cbf87f7145fae;hpb=24f0605c1fec98b77eddb880a405289b08cb5670;p=elogind.git

diff --git a/udev.h b/udev.h
index 5bd0e301c..64510ed35 100644
--- a/udev.h
+++ b/udev.h
@@ -31,9 +31,13 @@
 #define COMMENT_CHARACTER			'#'
 #define LINE_SIZE				512
 #define PATH_SIZE				512
-#define NAME_SIZE				128
+#define NAME_SIZE				256
 #define VALUE_SIZE				128
 
+#define ALLOWED_CHARS				"#+-.:=@_"
+#define ALLOWED_CHARS_FILE			ALLOWED_CHARS "/"
+#define ALLOWED_CHARS_INPUT			ALLOWED_CHARS_FILE " $%?,"
+
 #define DEFAULT_PARTITIONS_COUNT		15
 #define UDEV_ALARM_TIMEOUT			180
 
@@ -115,6 +119,7 @@ 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);
+extern int sysfs_lookup_devpath_by_subsys_id(char *devpath, size_t len, const char *subsystem, const char *id);
 
 /* 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);
@@ -137,6 +142,7 @@ struct name_entry {
 extern int log_priority(const char *priority);
 extern char *name_list_add(struct list_head *name_list, const char *name, int sort);
 extern char *name_list_key_add(struct list_head *name_list, const char *key, const char *value);
+extern int name_list_key_remove(struct list_head *name_list, const char *key);
 extern void name_list_cleanup(struct list_head *name_list);
 extern int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix);
 extern uid_t lookup_user(const char *user);
@@ -148,7 +154,7 @@ 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);
+extern int replace_chars(char *str, const char *white);
 
 /* udev_utils_file.c */
 extern int create_path(const char *path);