X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=ac29ec6f4424909fcd9799ec1db1fbeb3dc421ce;hp=56dab1f8323227b7fa7028914d1555a251f18710;hb=4af58c70571c5c63edaff20d2032c8eeb59678b6;hpb=e40fec176bcdd0b4e763cf85817a7e5c8e1c6c14

diff --git a/udev.c b/udev.c
index 56dab1f83..ac29ec6f4 100644
--- a/udev.c
+++ b/udev.c
@@ -27,9 +27,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -38,14 +40,6 @@
 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 inline char *get_action(void)
 {
 	char *action;
@@ -70,53 +64,6 @@ static inline char *get_seqnum(void)
 	return seqnum;
 }
 
-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_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, 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;
@@ -141,12 +88,12 @@ int main(int argc, char **argv, char **envp)
 		dbg ("no devpath?");
 		goto exit;
 	}
-	dbg("looking at %s", devpath);
+	dbg("looking at '%s'", devpath);
 
 	/* we only care about class devices and block stuff */
 	if (!strstr(devpath, "class") &&
 	    !strstr(devpath, "block")) {
-		dbg("not block or class");
+		dbg("not a block or class device");
 		goto exit;
 	}
 
@@ -162,11 +109,16 @@ int main(int argc, char **argv, char **envp)
 		goto exit;
 	}
 
+	/* initialize our configuration */
+	udev_init_config();
+
+	/* connect to the system message bus */
+	sysbus_connect();
+
 	/* 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;
 	}
 
@@ -180,12 +132,14 @@ int main(int argc, char **argv, char **envp)
 		retval = udev_remove_device(devpath, subsystem);
 
 	else {
-		dbg("Unknown action: %s", action);
+		dbg("unknown action '%s'", action);
 		retval = -EINVAL;
 	}
 	udevdb_exit();
 
-exit:	
+	/* disconnect from the system message bus */
+	sysbus_disconnect();
+
+exit:
 	return retval;
 }
-