summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-04-10 11:16:34 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 21:01:38 -0700
commit8b16416dce3d5feab0827668e1184301a19074a8 (patch)
tree8c7ae0db9819b625fab9ca239016e89265020d62
parent3f4967a1fbb4270b0577cca7d6a6d43a880875a5 (diff)
[PATCH] remove now works!
-rw-r--r--test5
-rw-r--r--udev.c37
2 files changed, 35 insertions, 7 deletions
diff --git a/test b/test
index 9cab4a6db7..730f0a446a 100644
--- a/test
+++ b/test
@@ -1,5 +1,6 @@
#!/bin/sh
-export ACTION=add
-export DEVPATH=/devices/pci0/00:09.0/usb1/1-1/1-1.2/ttyUSB7
+#export ACTION=add
+export ACTION=remove
+export DEVPATH=/devices/pci0/00:09.0/usb1/1-1/1-1.1/ttyUSB7
./udev tty
diff --git a/udev.c b/udev.c
index 4bb41a8696..5aa9b43d43 100644
--- a/udev.c
+++ b/udev.c
@@ -183,7 +183,21 @@ static int create_node(char *name, char type, int major, int minor, int mode)
return retval;
}
-static int add_node(char *device, char type)
+/*
+ * We also want to clean up any symlinks that were created in create_node()
+ */
+static int delete_node(char *name)
+{
+ char filename[255];
+
+ strncpy(filename, UDEV_ROOT, sizeof(filename));
+ strncat(filename, name, sizeof(filename));
+
+ dbg("unlinking %s", filename);
+ return unlink(filename);
+}
+
+static int add_device(char *device, char type)
{
char *name;
int major;
@@ -217,9 +231,22 @@ exit:
return retval;
}
-static int remove_node(char *device)
+static int remove_device(char *device)
{
- return 0;
+ char *name;
+ int retval = 0;
+
+ name = get_name(device, 0, 0);
+ if (name == NULL) {
+ dbg ("get_name failed");
+ retval = -ENODEV;
+ goto exit;
+ }
+
+ return delete_node(name);
+
+exit:
+ return retval;
}
int main(int argc, char *argv[])
@@ -256,10 +283,10 @@ int main(int argc, char *argv[])
dbg("looking at %s", device);
if (strcmp(action, "add") == 0)
- return add_node(device, type);
+ return add_device(device, type);
if (strcmp(action, "remove") == 0)
- return remove_node(device);
+ return remove_device(device);
dbg("Unknown action: %s", action);
return -EINVAL;