X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=094905ecc2025a90288c9eb5e0fb901bc0b951e3;hb=8448980019ab305c99b7ff47185da08c7bc33fe0;hp=0aba8c4bf9aa133999dedb8b8e209d078593aaf3;hpb=c27e69116d3ef0ea069a3c5146009ced08a0238b;p=elogind.git

diff --git a/udev.c b/udev.c
index 0aba8c4bf..094905ecc 100644
--- a/udev.c
+++ b/udev.c
@@ -34,8 +34,19 @@
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
+/* global variables */
+char **main_argv;
+char **main_envp;
+
+char sysfs_path[SYSFS_PATH_MAX];
+char *udev_config_dir = UDEV_CONFIG_DIR;
+char *udev_root = UDEV_ROOT;
+char udev_db_filename[PATH_MAX+NAME_MAX];
+char udev_config_permission_filename[PATH_MAX+NAME_MAX];
+char udev_config_filename[PATH_MAX+NAME_MAX];
 
-static char *get_action(void)
+
+static inline char *get_action(void)
 {
 	char *action;
 
@@ -43,28 +54,81 @@ static char *get_action(void)
 	return action;
 }
 
+static inline char *get_devpath(void)
+{
+	char *devpath;
 
-static char *get_device(void)
+	devpath = getenv("DEVPATH");
+	return devpath;
+}
+
+static inline char *get_seqnum(void)
 {
-	char *device;
+	char *seqnum;
 
-	device = getenv("DEVPATH");
-	return device;
+	seqnum = getenv("SEQNUM");
+	return seqnum;
 }
 
-char **main_argv;
-char **main_envp;
+static void get_dirs(void)
+{
+	char *temp;
+	char *udev_db = UDEV_DB;
+	char *udev_config = UDEV_CONFIG_FILE;
+	char *udev_permission = UDEV_CONFIG_PERMISSION_FILE;
+	int retval;
+
+	retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
+	if (retval)
+		dbg("sysfs_get_mnt_path failed");
+
+	/* see if we should try to override any of the default values */
+	temp = getenv("UDEV_TEST");
+	if (temp != NULL) {
+		/* hm testing is happening, use the specified values, if they are present */
+		temp = getenv("SYSFS_PATH");
+		if (temp)
+			strncpy(sysfs_path, temp, sizeof(sysfs_path));
+		temp = getenv("UDEV_CONFIG_DIR");
+		if (temp)
+			udev_config_dir = temp;
+		temp = getenv("UDEV_ROOT");
+		if (temp)
+			udev_root = temp;
+		temp = getenv("UDEV_DB");
+		if (temp)
+			udev_db = temp;
+		temp = getenv("UDEV_CONFIG_FILE");
+		if (temp)
+			udev_config = temp;
+		temp = getenv("UDEV_PERMISSION_FILE");
+		if (temp)
+			udev_permission = temp;
+	}
+	dbg("sysfs_path='%s'", sysfs_path);
+
+	strncpy(udev_db_filename, udev_root, sizeof(udev_db_filename));
+	strncat(udev_db_filename, udev_db, sizeof(udev_db_filename));
+
+	strncpy(udev_config_filename, udev_config_dir, sizeof(udev_config_filename));
+	strncat(udev_config_filename, udev_config, sizeof(udev_config_filename));
+	
+	strncpy(udev_config_permission_filename, udev_config_dir, sizeof(udev_config_permission_filename));
+	strncat(udev_config_permission_filename, udev_permission, sizeof(udev_config_permission_filename));
+}
 
 int main(int argc, char **argv, char **envp)
 {
 	char *action;
-	char *device;
+	char *devpath;
 	char *subsystem;
 	int retval = -EINVAL;
 	
 	main_argv = argv;
 	main_envp = envp;
 
+	dbg("version %s", UDEV_VERSION);
+
 	if (argc != 2) {
 		dbg ("unknown number of arguments");
 		goto exit;
@@ -72,17 +136,17 @@ int main(int argc, char **argv, char **envp)
 
 	subsystem = argv[1];
 
-	device = get_device();
-	if (!device) {
-		dbg ("no device?");
+	devpath = get_devpath();
+	if (!devpath) {
+		dbg ("no devpath?");
 		goto exit;
 	}
-	dbg("looking at %s", device);
+	dbg("looking at '%s'", devpath);
 
 	/* we only care about class devices and block stuff */
-	if (!strstr(device, "class") &&
-	    !strstr(device, "block")) {
-		dbg("not block or class");
+	if (!strstr(devpath, "class") &&
+	    !strstr(devpath, "block")) {
+		dbg("not a block or class device");
 		goto exit;
 	}
 
@@ -99,9 +163,10 @@ int main(int argc, char **argv, char **envp)
 	}
 
 	/* initialize udev database */
+	get_dirs();
 	retval = udevdb_init(UDEVDB_DEFAULT);
 	if (retval != 0) {
-		dbg("Unable to initialize database.");
+		dbg("unable to initialize database");
 		goto exit;
 	}
 
@@ -109,13 +174,13 @@ int main(int argc, char **argv, char **envp)
 	namedev_init();
 
 	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(device, argv[1]);
+		retval = udev_add_device(devpath, subsystem);
 
 	else if (strcmp(action, "remove") == 0)
-		retval = udev_remove_device(device, argv[1]);
+		retval = udev_remove_device(devpath, subsystem);
 
 	else {
-		dbg("Unknown action: %s", action);
+		dbg("unknown action '%s'", action);
 		retval = -EINVAL;
 	}
 	udevdb_exit();
@@ -123,4 +188,3 @@ int main(int argc, char **argv, char **envp)
 exit:	
 	return retval;
 }
-