[PATCH] update the tests to handle block devices too.

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 4bb41a869638edb48881351d51476113a89d3bec..dc5f5b8d8944006125b6d941d3c0e8da467df3aa 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -30,6 +30,7 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "namedev.h"
 
 
 static char *get_action(void)
@@ -49,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;
@@ -183,14 +185,28 @@ 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, 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");
@@ -210,20 +226,34 @@ static int add_node(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;
 }
 
-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[])
 {
+       struct device_attr attr;
        char *subsystem;
        char *action;
        char *device;
@@ -235,6 +265,13 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
+       namedev_init();
+
+       /* sleep for a second or two to give the kernel a chance to
+        * create the dev file
+        */
+       sleep(2);
+
        /* for now, the block layer is the only place where block devices are */
        subsystem = argv[1];
        if (strcmp(subsystem, "block") == 0)
@@ -255,11 +292,15 @@ 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_node(device, type);
+               return add_device(device, type, &attr);
 
        if (strcmp(action, "remove") == 0)
-               return remove_node(device);
+               return remove_device(device);
 
        dbg("Unknown action: %s", action);
        return -EINVAL;