[PATCH] correct error path for PROGRAM execution

[elogind.git] / udev_rules.h

diff --git a/udev_rules.h b/udev_rules.h
index 688d4798e16650120469f843e479794afa0fc745..561ba1687d370d320ff9501bb6be7439c81e454e 100644 (file)
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -31,11 +31,12 @@
 #define KEY_KERNEL             "KERNEL"
 #define KEY_SUBSYSTEM          "SUBSYSTEM"
 #define KEY_BUS                        "BUS"
-#define KEY_SYSFS              "SYSFS"
 #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"
@@ -48,20 +49,21 @@
 #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"
 
 enum key_operation {
-       KEY_OP_UNKNOWN,
+       KEY_OP_UNSET,
        KEY_OP_MATCH,
        KEY_OP_NOMATCH,
        KEY_OP_ADD,
        KEY_OP_ASSIGN,
 };
 
-struct sysfs_pair {
-       char file[PATH_SIZE];
+struct key_pair {
+       char name[NAME_SIZE];
        char value[VALUE_SIZE];
        enum key_operation operation;
 };
@@ -83,7 +85,10 @@ struct udev_rule {
        enum key_operation program_operation;
        char result[PATH_SIZE];
        enum key_operation result_operation;
-       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+       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];