X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=94d054f76069940ac35b6d5de6ca219e9e3d8531;hb=b8cf73a533d887daaadaa47e0ba07d603ce64e1f;hp=5bd0e301c6d2681782d158b8901cbf87f7145fae;hpb=24f0605c1fec98b77eddb880a405289b08cb5670;p=elogind.git diff --git a/udev.h b/udev.h index 5bd0e301c..94d054f76 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 @@ -137,6 +141,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 +153,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);