[PATCH] fix scsi_id segfault with udev-009

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 1405d07e04ea8a301b9649a6ae11f5a86a330145..69c488936d13cc25a3ea3d9d792b977871cb20e4 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -28,7 +28,6 @@
 
 struct sysfs_class_device;
 
-#define COMMENT_CHARACTER              '#'
 
 enum config_type {
        KERNEL_NAME     = 0,    /* must be 0 to let memset() default to this value */
@@ -50,6 +49,16 @@ enum config_type {
 #define TYPE_TOPOLOGY  "TOPOLOGY"
 #define TYPE_REPLACE   "REPLACE"
 #define TYPE_CALLOUT   "CALLOUT"
+
+#define FIELD_BUS      "BUS"
+#define FIELD_ID       "ID"
+#define FIELD_SYSFS    "SYSFS_"
+#define FIELD_PLACE    "PLACE"
+#define FIELD_PROGRAM  "PROGRAM"
+#define FIELD_KERNEL   "KERNEL"
+#define FIELD_NAME     "NAME"
+#define FIELD_SYMLINK  "SYMLINK"
+
 #define CALLOUT_MAXARG 8
 
 struct config_device {
@@ -63,8 +72,13 @@ struct config_device {
        char place[PLACE_SIZE];
        char kernel_name[NAME_SIZE];
        char exec_program[FILE_SIZE];
+       char name[NAME_SIZE];
+       char symlink[NAME_SIZE];
+};
+
+struct perm_device {
+       struct list_head node;
 
-       /* what to set the device to */
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
@@ -72,14 +86,20 @@ struct config_device {
 };
 
 extern struct list_head config_device_list;
+extern struct list_head perm_device_list;
 
 extern int namedev_init(void);
 extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev);
 extern int namedev_init_permissions(void);
-extern int namedev_init_config(void);
+extern int namedev_init_rules(void);
 
 extern int add_config_dev(struct config_device *new_dev);
+extern int add_perm_dev(struct perm_device *new_dev);
 extern void dump_config_dev(struct config_device *dev);
 extern void dump_config_dev_list(void);
+extern void dump_perm_dev(struct perm_device *dev);
+extern void dump_perm_dev_list(void);
+
+extern int get_pair(char **orig_string, char **left, char **right);
 
 #endif