X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=1e3db5af27e95c4309e4ec24096ee43e8ba2f73c;hb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132;hp=70de729f30033c7a92f94013e343011703f96f64;hpb=7a947ce51586fd4212447643df90580542777ab9;p=elogind.git

diff --git a/udev.h b/udev.h
index 70de729f3..1e3db5af2 100644
--- 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,31 +41,35 @@
 
 #define LINE_SIZE			256
 
-/* length of public data to store in udevdb */
-#define UDEVICE_DB_LEN (offsetof(struct udevice, devpath))
+#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];
 	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 ignore_remove;
 	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];
 	char kernel_number[NAME_SIZE];
 	char kernel_name[NAME_SIZE];
+	char devname[NAME_SIZE];
 	int test_run;
 };
 
@@ -74,13 +78,11 @@ 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_send(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_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];