X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=74572625afaae0830175bcf653e2063fc3d0b7b3;hp=1ac1c985076be16e6d1eab73fdd65d7b58cb7d33;hb=0abf54fc09030f404f5c7d724a0f30d3e875e980;hpb=f0083e3d4eb49e11fd7e37532dc64a6e6f5d4039

diff --git a/udev.c b/udev.c
index 1ac1c9850..74572625a 100644
--- a/udev.c
+++ b/udev.c
@@ -23,8 +23,15 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
 #include "udev.h"
 #include "udev_version.h"
+#include "namedev.h"
+#include "libsysfs/libsysfs.h"
 
 
 static char *get_action(void)
@@ -36,48 +43,67 @@ static char *get_action(void)
 }
 
 
-/* yeah this should be dynamically allocated... */
-static char device[255];
-
 static char *get_device(void)
 {
-	char *temp;
-
-	temp = getenv("DEVPATH");
-	if (temp == NULL)
-		return NULL;
-	strcpy(device, SYSFS_ROOT);
-	strcat(device, temp);
+	char *device;
 
+	device = getenv("DEVPATH");
 	return device;
 }
 
-
 int main(int argc, char *argv[])
 {
-	char *subsystem;
 	char *action;
-	char *dev;
+	char *device;
+	char *subsystem;
+	int retval = -EINVAL;
 	
 	if (argc != 2) {
 		dbg ("unknown number of arguments");
-		return 1;
+		goto exit;
 	}
 
 	subsystem = argv[1];
 
+	device = get_device();
+	if (!device) {
+		dbg ("no device?");
+		goto exit;
+	}
+	dbg("looking at %s", device);
+
+	/* we only care about class devices and block stuff */
+	if (!strstr(device, "class") &&
+	    !strstr(device, "block")) {
+		dbg("not block or class");
+		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 the naming deamon */
+	namedev_init();
+
+	if (strcmp(action, "add") == 0)
+		return udev_add_device(device, argv[1]);
+
+	if (strcmp(action, "remove") == 0)
+		return udev_remove_device(device, argv[1]);
+
+	dbg("Unknown action: %s", action);
+	retval = -EINVAL;
 
-	return 0;
+exit:	
+	return retval;
 }