X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=a3984771188a50d33a3e6b02fcf38922868ea8df;hp=74572625afaae0830175bcf653e2063fc3d0b7b3;hb=d4e52dd0d95c21ccda50310404be4b5a540cc498;hpb=ea733a2f00174c3a39c8eb783e330b6a69abd67c

diff --git a/udev.c b/udev.c
index 74572625a..a39847711 100644
--- a/udev.c
+++ b/udev.c
@@ -31,6 +31,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
+#include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
 
@@ -51,13 +52,21 @@ static char *get_device(void)
 	return device;
 }
 
-int main(int argc, char *argv[])
+char **main_argv;
+char **main_envp;
+
+int main(int argc, char **argv, char **envp)
 {
 	char *action;
 	char *device;
 	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;
@@ -91,17 +100,27 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
+	/* initialize udev database */
+	retval = udevdb_init(UDEVDB_DEFAULT);
+	if (retval != 0) {
+		dbg("Unable to initialize database.");
+		goto exit;
+	}
+
 	/* initialize the naming deamon */
 	namedev_init();
 
 	if (strcmp(action, "add") == 0)
-		return udev_add_device(device, argv[1]);
+		retval = udev_add_device(device, argv[1]);
 
-	if (strcmp(action, "remove") == 0)
-		return udev_remove_device(device, argv[1]);
+	else if (strcmp(action, "remove") == 0)
+		retval = udev_remove_device(device, argv[1]);
 
-	dbg("Unknown action: %s", action);
-	retval = -EINVAL;
+	else {
+		dbg("Unknown action: %s", action);
+		retval = -EINVAL;
+	}
+	udevdb_exit();
 
 exit:	
 	return retval;