udevtest: print message before log output

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index d09c9922cdb40fb8d0ffb503ce7b52c2a1316647..454ea4280b53992fc76a97bea0334f5c7c385d78 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -29,12 +29,15 @@
 #include "udev_version.h"
 
 #define COMMENT_CHARACTER                      '#'
-#define PATH_TO_NAME_CHAR                      '@'
 #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 " $/?,"
+
 #define DEFAULT_PARTITIONS_COUNT               15
 #define UDEV_ALARM_TIMEOUT                     180
 
@@ -45,6 +48,7 @@
 #define WRITE_END                              1
 
 #define DB_DIR                                 ".udev/db"
+#define DB_NAME_INDEX_DIR                      ".udev/names"
 
 struct udev_rules;
 
@@ -86,19 +90,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);
@@ -117,15 +122,15 @@ 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);
-extern int udev_node_add(struct udevice *udev, struct udevice *udev_old);
-extern void udev_node_remove_symlinks(struct udevice *udev);
+extern void udev_node_update_symlinks(struct udevice *udev, struct udevice *udev_old);
+extern int udev_node_add(struct udevice *udev);
 extern int udev_node_remove(struct udevice *udev);
 
 /* udev_db.c */
 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 */
@@ -136,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);
@@ -144,8 +150,10 @@ 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);
+extern int replace_chars(char *str, const char *white);
 
 /* udev_utils_file.c */
 extern int create_path(const char *path);