[PATCH] use numeric owner/group as default values to avoid parsing userdb

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index f5b63a8805ee728986dcf609eb203beafaf5e06d..1d6920cc7cdcc657971b55af34833f106ed9efd6 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
  *
  * Userspace devfs
  *

- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>

  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the


@@ -28,25 +28,37 @@
 
 struct sysfs_class_device;
 
 
 struct sysfs_class_device;
 

-#define BUS_SIZE       30
-#define FILE_SIZE      50
-#define VALUE_SIZE     100
-#define ID_SIZE                50
-#define PLACE_SIZE     50
-#define PROGRAM_SIZE   100
-
-#define FIELD_BUS      "BUS"
-#define FIELD_SYSFS    "SYSFS_"
-#define FIELD_ID       "ID"
-#define FIELD_PLACE    "PLACE"
-#define FIELD_PROGRAM  "PROGRAM"
-#define FIELD_RESULT   "RESULT"
-#define FIELD_KERNEL   "KERNEL"
-#define FIELD_NAME     "NAME"
-#define FIELD_SYMLINK  "SYMLINK"
-
-#define PROGRAM_MAXARG 10
-#define MAX_SYSFS_PAIRS        5
+#define BUS_SIZE               32
+#define FILE_SIZE              64
+#define VALUE_SIZE             128
+#define ID_SIZE                        64
+#define PLACE_SIZE             64
+#define DRIVER_SIZE            64
+#define PROGRAM_SIZE           128
+
+#define FIELD_KERNEL           "KERNEL"
+#define FIELD_SUBSYSTEM                "SUBSYSTEM"
+#define FIELD_BUS              "BUS"
+#define FIELD_SYSFS            "SYSFS"
+#define FIELD_ID               "ID"
+#define FIELD_PLACE            "PLACE"
+#define FIELD_PROGRAM          "PROGRAM"
+#define FIELD_RESULT           "RESULT"
+#define FIELD_DRIVER           "DRIVER"
+#define FIELD_NAME             "NAME"
+#define FIELD_SYMLINK          "SYMLINK"
+#define FIELD_OWNER            "OWNER"
+#define FIELD_GROUP            "GROUP"
+#define FIELD_MODE             "MODE"
+#define FIELD_OPTIONS          "OPTIONS"
+
+#define OPTION_IGNORE_DEVICE   "ignore_device"
+#define OPTION_IGNORE_REMOVE   "ignore_remove"
+#define OPTION_PARTITIONS      "all_partitions"
+
+#define MAX_SYSFS_PAIRS                5
+
+#define RULEFILE_SUFFIX                ".rules"

 
 struct sysfs_pair {
        char file[FILE_SIZE];
 
 struct sysfs_pair {
        char file[FILE_SIZE];


@@ -56,40 +68,37 @@ struct sysfs_pair {
 struct config_device {
        struct list_head node;
 
 struct config_device {
        struct list_head node;
 

+       char kernel[NAME_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];

        char bus[BUS_SIZE];
        char id[ID_SIZE];
        char place[PLACE_SIZE];
        char bus[BUS_SIZE];
        char id[ID_SIZE];
        char place[PLACE_SIZE];

-       char kernel[NAME_SIZE];
+       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];

        char program[PROGRAM_SIZE];
        char result[PROGRAM_SIZE];
        char program[PROGRAM_SIZE];
        char result[PROGRAM_SIZE];

+       char driver[DRIVER_SIZE];

        char name[NAME_SIZE];
        char symlink[NAME_SIZE];
        char name[NAME_SIZE];
        char symlink[NAME_SIZE];

-       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
-};

 
 

-struct perm_device {
-       struct list_head node;
-
-       char name[NAME_SIZE];
-       char owner[OWNER_SIZE];
-       char group[GROUP_SIZE];
+       char owner[USER_SIZE];
+       char group[USER_SIZE];

        mode_t mode;
        mode_t mode;

+
+       int partitions;
+       int ignore_device;
+       int ignore_remove;
+
+       char config_file[NAME_SIZE];
+       int config_line;

 };
 
 extern struct list_head config_device_list;
 };
 
 extern struct list_head config_device_list;

-extern struct list_head perm_device_list;

 
 extern int namedev_init(void);
 
 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_rules(void);
+extern int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev);
+extern void namedev_close(void);

 
 

-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_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
 
 #endif