more fixups

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 1cf4ad7eae988893029ed7d784c3aa7b144fdcbe..1e3db5af27e95c4309e4ec24096ee43e8ba2f73c 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -30,8 +30,8 @@
 #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,9 +41,16 @@
 
 #define LINE_SIZE                      256
 
+#define DEVD_DIR                       "/etc/dev.d"
+#define DEVD_SUFFIX                    ".dev"
+
+#define HOTPLUGD_DIR                   "/etc/hotplug.d"
+#define HOTPLUG_SUFFIX                 ".hotplug"
+
 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];
@@ -53,6 +60,7 @@ struct udevice {
        mode_t mode;
        char symlink[NAME_SIZE];
        int partitions;
+       int ignore_remove;
        int config_line;
        char config_file[NAME_SIZE];
        long config_uptime;
@@ -70,10 +78,8 @@ extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
 extern int udev_start(void);
 extern int parse_get_pair(char **orig_string, char **left, char **right);
-extern void dev_d_execute(struct udevice *udev);
+extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 
-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_path[PATH_MAX+NAME_MAX];