X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=dc5f5b8d8944006125b6d941d3c0e8da467df3aa;hb=185a35a403cc37b3943bc68aa61745ff2b6ed17b;hp=bf170d1651d55c69c253d72144f8bb9b07d99bb8;hpb=28972fe8a9a314761aacd16bf19f89dbaf5a9282;p=elogind.git

diff --git a/udev.c b/udev.c
index bf170d165..dc5f5b8d8 100644
--- a/udev.c
+++ b/udev.c
@@ -50,7 +50,8 @@ static char *get_device(void)
 	temp = getenv("DEVPATH");
 	if (temp == NULL)
 		return NULL;
-	strcpy(device, SYSFS_ROOT);
+	strcpy(device, "");
+//	strcpy(device, SYSFS_ROOT);
 	strcat(device, temp);
 
 	return device;
@@ -198,14 +199,14 @@ static int delete_node(char *name)
 	return unlink(filename);
 }
 
-static int add_device(char *device, char type)
+static int add_device(char *device, char type, struct device_attr *attr)
 {
 	char *name;
 	int major;
 	int minor;
 	int mode;
 	int retval = -EINVAL;
-
+#if 0
 	retval = get_major_minor(device, &major, &minor);
 	if (retval) {
 		dbg ("get_major_minor failed");
@@ -225,8 +226,8 @@ static int add_device(char *device, char type)
 		retval = -EINVAL;
 		goto exit;
 	}
-
-	return create_node(name, type, major, minor, mode);
+#endif
+	return create_node(attr->name, type, attr->major, attr->minor, attr->mode);
 
 exit:
 	return retval;
@@ -252,6 +253,7 @@ exit:
 
 int main(int argc, char *argv[])
 {
+	struct device_attr attr;
 	char *subsystem;
 	char *action;
 	char *device;
@@ -290,8 +292,12 @@ int main(int argc, char *argv[])
 	}
 	dbg("looking at %s", device);
 
+	retval = namedev_name_device(device, &attr);
+	if (retval)
+		return retval;
+
 	if (strcmp(action, "add") == 0)
-		return add_device(device, type);
+		return add_device(device, type, &attr);
 
 	if (strcmp(action, "remove") == 0)
 		return remove_device(device);