[PATCH] make config files, sysfs root, and udev root configurable from config variables

This will make running tests a lot simpler.

1 files changed, 66 insertions, 16 deletions

diff --git a/udev.c b/udev.c
index a398477118..8d650c2561 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;
+char *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,22 +54,60 @@ static char *get_action(void)
 	return action;
 }
 
+static inline char *get_devpath(void)
+{
+	char *devpath;
+
+	devpath = getenv("DEVPATH");
+	return devpath;
+}
 
-static char *get_device(void)
+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 *udev_test;
+	char *temp;
+	int retval;
+
+	udev_test = getenv("UDEV_TEST");
+	if (udev_test == NULL) {
+		/* normal operation, use the compiled in defaults */
+		udev_config_dir = UDEV_CONFIG_DIR;
+		udev_root = UDEV_ROOT;
+		retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
+		dbg("sysfs_path = %s", sysfs_path);
+		if (retval)
+			dbg("sysfs_get_mnt_path failed");
+
+	} else {
+		/* hm testing is happening, use the specified values */
+		temp = getenv("UDEV_SYSFS_PATH");
+		strncpy(sysfs_path, temp, sizeof(sysfs_path));
+		udev_config_dir = getenv("UDEV_CONFIG_DIR");
+		udev_root = getenv("UDEV_ROOT");
+	}
+
+	strncpy(udev_db_filename, udev_config_dir, 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, NAMEDEV_CONFIG_FILE, sizeof(udev_config_filename));
+	
+	strncpy(udev_config_permission_filename, udev_config_dir, sizeof(udev_config_permission_filename));
+	strncat(udev_config_permission_filename, NAMEDEV_CONFIG_PERMISSION_FILE, sizeof(udev_config_permission_filename));
+}
 
 int main(int argc, char **argv, char **envp)
 {
 	char *action;
-	char *device;
+	char *devpath;
 	char *subsystem;
 	int retval = -EINVAL;
 	
@@ -74,16 +123,16 @@ 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")) {
+	if (!strstr(devpath, "class") &&
+	    !strstr(devpath, "block")) {
 		dbg("not block or class");
 		goto exit;
 	}
@@ -101,6 +150,7 @@ 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.");
@@ -111,10 +161,10 @@ 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);