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

diff --git a/udev.c b/udev.c
index 1ac1c9850..ac29ec6f4 100644
--- a/udev.c
+++ b/udev.c
@@ -23,11 +23,24 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
+#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"
 
+/* global variables */
+char **main_argv;
+char **main_envp;
 
-static char *get_action(void)
+static inline char *get_action(void)
 {
 	char *action;
 
@@ -35,49 +48,98 @@ static char *get_action(void)
 	return action;
 }
 
+static inline char *get_devpath(void)
+{
+	char *devpath;
 
-/* yeah this should be dynamically allocated... */
-static char device[255];
+	devpath = getenv("DEVPATH");
+	return devpath;
+}
 
-static char *get_device(void)
+static inline char *get_seqnum(void)
 {
-	char *temp;
+	char *seqnum;
 
-	temp = getenv("DEVPATH");
-	if (temp == NULL)
-		return NULL;
-	strcpy(device, SYSFS_ROOT);
-	strcat(device, temp);
-
-	return device;
+	seqnum = getenv("SEQNUM");
+	return seqnum;
 }
 
-
-int main(int argc, char *argv[])
+int main(int argc, char **argv, char **envp)
 {
-	char *subsystem;
 	char *action;
-	char *dev;
+	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");
-		return 1;
+		goto exit;
 	}
 
 	subsystem = argv[1];
 
+	devpath = get_devpath();
+	if (!devpath) {
+		dbg ("no devpath?");
+		goto exit;
+	}
+	dbg("looking at '%s'", devpath);
+
+	/* we only care about class devices and block stuff */
+	if (!strstr(devpath, "class") &&
+	    !strstr(devpath, "block")) {
+		dbg("not a block or class device");
+		goto exit;
+	}
+
+	/* but we don't care about net class devices */
+	if (strcmp(subsystem, "net") == 0) {
+		dbg("don't care about net devices");
+		goto exit;
+	}
+
 	action = get_action();
 	if (!action) {
 		dbg ("no action?");
-		return 1;
+		goto exit;
 	}
 
-	dev = get_device();
-	if (!dev) {
-		dbg ("no device?");
-		return 1;
+	/* initialize our configuration */
+	udev_init_config();
+
+	/* connect to the system message bus */
+	sysbus_connect();
+
+	/* initialize udev database */
+	retval = udevdb_init(UDEVDB_DEFAULT);
+	if (retval != 0) {
+		dbg("unable to initialize database");
+		goto exit;
 	}
 
-	return 0;
-}
+	/* initialize the naming deamon */
+	namedev_init();
 
+	if (strcmp(action, "add") == 0)
+		retval = udev_add_device(devpath, subsystem);
+
+	else if (strcmp(action, "remove") == 0)
+		retval = udev_remove_device(devpath, subsystem);
+
+	else {
+		dbg("unknown action '%s'", action);
+		retval = -EINVAL;
+	}
+	udevdb_exit();
+
+	/* disconnect from the system message bus */
+	sysbus_disconnect();
+
+exit:
+	return retval;
+}