[PATCH] add ACTION to udev object to expose it to the whole process

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index f7a13a634b77e75fff756248e0ca98df7579b0a2..3f9f2c8612019e27f99c6849d72ab4a8778e916c 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -26,12 +26,12 @@
 #include <sys/param.h>
 #include "libsysfs/sysfs/libsysfs.h"
 
-#define ALARM_TIMEOUT                  30
+#define ALARM_TIMEOUT                  120
 #define COMMENT_CHARACTER              '#'
 
 #define NAME_SIZE                      256
-#define OWNER_SIZE                     30
-#define GROUP_SIZE                     30
+#define OWNER_SIZE                     32
+#define GROUP_SIZE                     32
 #define MODE_SIZE                      8
 
 #define ACTION_SIZE                    32
@@ -41,26 +41,22 @@
 
 #define LINE_SIZE                      256
 
-/* length of public data to store in udevdb */
-#define UDEVICE_DB_LEN (offsetof(struct udevice, devpath))
-
 struct udevice {
+       char devpath[DEVPATH_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
+       char action[ACTION_SIZE];
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
        char type;
        int major;
        int minor;
-       unsigned int mode;      /* not mode_t due to conflicting definitions in different libcs */
+       mode_t mode;
        char symlink[NAME_SIZE];
        int partitions;
        int config_line;
        char config_file[NAME_SIZE];
        long config_uptime;
-
-       /* private data, not stored in udevdb */
-       char devpath[DEVPATH_SIZE];
-       char subsystem[SUBSYSTEM_SIZE];
        char bus_id[SYSFS_NAME_LEN];
        char bus[SYSFS_NAME_LEN];
        char program_result[NAME_SIZE];
@@ -81,7 +77,7 @@ extern char **main_argv;
 extern char **main_envp;
 extern char sysfs_path[SYSFS_PATH_MAX];
 extern char udev_root[PATH_MAX];
-extern char udev_db_filename[PATH_MAX+NAME_MAX];
+extern char udev_db_path[PATH_MAX+NAME_MAX];
 extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
 extern char udev_config_filename[PATH_MAX+NAME_MAX];
 extern char udev_rules_filename[PATH_MAX+NAME_MAX];