[PATCH] rename namedev_dev to udev_rule

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index cf66e7cc89d9fed2a903a9d4f7556e3a301700fe..069cecf973193212f82a89a7c0743e6d256a83fc 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -32,16 +32,16 @@
 #include <unistd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "logging.h"
 
 
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
+#ifdef USE_LOG
 void log_message(int level, const char *format, ...)
 {
        va_list args;
@@ -55,31 +55,32 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-/* (for now) true if udevsend is the helper */
+/* decide if we should manage the whole hotplug event
+ * for now look if the kernel calls udevsend instead of /sbin/hotplug
+ */
 static int manage_hotplug_event(void) {
        char helper[256];
        int fd;
        int len;
 
-       /* false, if we are called directly */
-       if (!getenv("MANAGED_EVENT"))
-               goto exit;
+       /* don't handle hotplug.d if we are called directly */
+       if (!getenv("UDEVD_EVENT"))
+               return 0;
 
        fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
        if (fd < 0)
-               goto exit;
+               return 0;
 
        len = read(fd, helper, 256);
        close(fd);
 
        if (len < 0)
-               goto exit;
+               return 0;
        helper[len] = '\0';
 
        if (strstr(helper, "udevsend"))
                return 1;
 
-exit:
        return 0;
 }
 
@@ -96,15 +97,16 @@ static void asmlinkage sig_handler(int signum)
 
 int main(int argc, char *argv[], char *envp[])
 {
-       struct sigaction act;
        struct sysfs_class_device *class_dev;
        struct sysfs_device *devices_dev;
        struct udevice udev;
-       char path[SYSFS_PATH_MAX];
+       char path[PATH_SIZE];
        const char *error;
        const char *action;
        const char *devpath;
        const char *subsystem;
+       int managed_event;
+       struct sigaction act;
        int retval = -EINVAL;
 
        if (argc == 2 && strcmp(argv[1], "-V") == 0) {
@@ -129,16 +131,10 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timeout to prevent hanging processes */
        alarm(ALARM_TIMEOUT);
 
-       if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
-               dbg("udevstart");
-
-               /* disable all logging, as it's much too slow on some facilities */
-               udev_log = 0;
-
-               namedev_init();
-               retval = udev_start();
-               goto exit;
-       }
+       /* let the executed programs know if we handle the whole hotplug event */
+       managed_event = manage_hotplug_event();
+       if (managed_event)
+               setenv("MANAGED_EVENT", "1", 1);
 
        action = getenv("ACTION");
        devpath = getenv("DEVPATH");
@@ -146,20 +142,11 @@ int main(int argc, char *argv[], char *envp[])
        /* older kernels passed the SUBSYSTEM only as argument */
        if (!subsystem && argc == 2)
                subsystem = argv[1];
-       udev_init_device(&udev, devpath, subsystem);
 
-       if (!action) {
-               dbg("no action");
-               goto hotplug;
-       }
-
-       if (!subsystem) {
-               dbg("no subsystem");
-               goto hotplug;
-       }
+       udev_init_device(&udev, devpath, subsystem);
 
-       if (!devpath) {
-               dbg("no devpath");
+       if (!action || !subsystem || !devpath) {
+               dbg("action, subsystem or devpath missing");
                goto hotplug;
        }
 
@@ -167,18 +154,19 @@ int main(int argc, char *argv[], char *envp[])
        if (udev_log)
                setenv("UDEV_LOG", "1", 1);
 
-       if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) {
+       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
                if (strcmp(action, "add") == 0) {
                        /* wait for sysfs and possibly add node */
                        dbg("udev add");
 
                        /* skip subsystems without "dev", but handle net devices */
-                       if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
+                       if (udev.type != DEV_NET && subsystem_expect_no_dev(udev.subsystem)) {
                                dbg("don't care about '%s' devices", udev.subsystem);
                                goto hotplug;
                        }
 
-                       snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+                       snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+                       path[sizeof(path)-1] = '\0';
                        class_dev = wait_class_device_open(path);
                        if (class_dev == NULL) {
                                dbg ("open class device failed");
@@ -188,8 +176,8 @@ int main(int argc, char *argv[], char *envp[])
 
                        wait_for_class_device(class_dev, &error);
 
-                       /* init rules, permissions */
-                       namedev_init();
+                       /* init rules */
+                       udev_rules_init();
 
                        /* name, create node, store in db */
                        retval = udev_add_device(&udev, class_dev);
@@ -215,12 +203,13 @@ int main(int argc, char *argv[], char *envp[])
                        if (udev_dev_d)
                                udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
                }
-       } else if ((strncmp(devpath, "/devices/", 9) == 0)) {
+       } else if (udev.type == DEV_DEVICE) {
                if (strcmp(action, "add") == 0) {
                        /* wait for sysfs */
                        dbg("devices add");
 
-                       snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath);
+                       snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
+                       path[sizeof(path)-1] = '\0';
                        devices_dev = wait_devices_device_open(path);
                        if (!devices_dev) {
                                dbg("devices device unavailable (probably remove has beaten us)");
@@ -239,10 +228,10 @@ int main(int argc, char *argv[], char *envp[])
        }
 
 hotplug:
-       if (udev_hotplug_d && manage_hotplug_event())
+       udev_cleanup_device(&udev);
+       if (udev_hotplug_d && managed_event)
                udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
-exit:
        logging_close();
        return retval;
 }