[PATCH] add ENV{} key to match agains environment variables

[elogind.git] / udev_rules.h

diff --git a/udev_rules.h b/udev_rules.h
index 42552cfa410ece68203dfb7abddb905a21eff169..423a6f641ecb1f24632c4c5eeeecc595caf0e44a 100644 (file)
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -20,57 +20,78 @@
  *
  */
 
  *
  */
 

-#ifndef NAMEDEV_H
-#define NAMEDEV_H
+#ifndef UDEV_RULES_H
+#define UDEV_RULES_H

 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "list.h"
 
 
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "list.h"
 
 

-#define FIELD_KERNEL           "KERNEL"
-#define FIELD_SUBSYSTEM                "SUBSYSTEM"
-#define FIELD_BUS              "BUS"
-#define FIELD_SYSFS            "SYSFS"
-#define FIELD_ID               "ID"
-#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 KEY_KERNEL             "KERNEL"
+#define KEY_SUBSYSTEM          "SUBSYSTEM"
+#define KEY_BUS                        "BUS"
+#define KEY_ID                 "ID"
+#define KEY_PROGRAM            "PROGRAM"
+#define KEY_RESULT             "RESULT"
+#define KEY_DRIVER             "DRIVER"
+#define KEY_SYSFS              "SYSFS"
+#define KEY_ENV                        "ENV"
+#define KEY_NAME               "NAME"
+#define KEY_SYMLINK            "SYMLINK"
+#define KEY_OWNER              "OWNER"
+#define KEY_GROUP              "GROUP"
+#define KEY_MODE               "MODE"
+#define KEY_OPTIONS            "OPTIONS"

 
 #define OPTION_LAST_RULE       "last_rule"
 #define OPTION_IGNORE_DEVICE   "ignore_device"
 #define OPTION_IGNORE_REMOVE   "ignore_remove"
 #define OPTION_PARTITIONS      "all_partitions"
 
 
 #define OPTION_LAST_RULE       "last_rule"
 #define OPTION_IGNORE_DEVICE   "ignore_device"
 #define OPTION_IGNORE_REMOVE   "ignore_remove"
 #define OPTION_PARTITIONS      "all_partitions"
 

-#define MAX_SYSFS_PAIRS                5
+#define KEY_SYSFS_PAIRS_MAX    5
+#define KEY_ENV_PAIRS_MAX      5

 
 #define RULEFILE_SUFFIX                ".rules"
 
 
 #define RULEFILE_SUFFIX                ".rules"
 

-struct sysfs_pair {
-       char file[PATH_SIZE];
+enum key_operation {
+       KEY_OP_UNKNOWN,
+       KEY_OP_MATCH,
+       KEY_OP_NOMATCH,
+       KEY_OP_ADD,
+       KEY_OP_ASSIGN,
+};
+
+struct key_pair {
+       char name[NAME_SIZE];

        char value[VALUE_SIZE];
        char value[VALUE_SIZE];

+       enum key_operation operation;

 };
 
 struct udev_rule {
        struct list_head node;
 
        char kernel[NAME_SIZE];
 };
 
 struct udev_rule {
        struct list_head node;
 
        char kernel[NAME_SIZE];

+       enum key_operation kernel_operation;

        char subsystem[NAME_SIZE];
        char subsystem[NAME_SIZE];

+       enum key_operation subsystem_operation;

        char bus[NAME_SIZE];
        char bus[NAME_SIZE];

+       enum key_operation bus_operation;

        char id[NAME_SIZE];
        char id[NAME_SIZE];

-       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+       enum key_operation id_operation;
+       char driver[NAME_SIZE];
+       enum key_operation driver_operation;

        char program[PATH_SIZE];
        char program[PATH_SIZE];

+       enum key_operation program_operation;

        char result[PATH_SIZE];
        char result[PATH_SIZE];

-       char driver[NAME_SIZE];
+       enum key_operation result_operation;
+       struct key_pair sysfs_pair[KEY_SYSFS_PAIRS_MAX];
+       int sysfs_pair_count;
+       struct key_pair env_pair[KEY_ENV_PAIRS_MAX];
+       int env_pair_count;
+

        char name[PATH_SIZE];
        char symlink[PATH_SIZE];
        char name[PATH_SIZE];
        char symlink[PATH_SIZE];

-

        char owner[USER_SIZE];
        char group[USER_SIZE];
        mode_t mode;
        char owner[USER_SIZE];
        char group[USER_SIZE];
        mode_t mode;


@@ -90,7 +111,4 @@ extern int udev_rules_init(void);
 extern int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_dev);
 extern void udev_rules_close(void);
 
 extern int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_dev);
 extern void udev_rules_close(void);
 

-extern void udev_rule_dump(struct udev_rule *rule);
-extern void udev_rule_list_dump(void);
-

 #endif
 #endif