substitute format chars in RUN after rule matching

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 7978bdb08abd05c1e8eb49d6ae7c776b1e7fecd9..8a352e1eb9f52b07f4d9b6cd71d09e16e94eb158 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -42,16 +42,11 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 
-#include "list.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_version.h"
 #include "udev_rules.h"
-#include "udev_utils.h"
 #include "udevd.h"
-#include "logging.h"
 
-struct udev_rules rules;
+static struct udev_rules rules;
 static int udevd_sock;
 static int uevent_netlink_sock;
 static int inotify_fd;
@@ -94,8 +89,7 @@ static void asmlinkage udev_event_sig_handler(int signum)
 static int udev_event_process(struct uevent_msg *msg)
 {
        struct sigaction act;
-       struct udevice udev;
-       struct name_entry *name_loop;
+       struct udevice *udev;
        int i;
        int retval;
 
@@ -109,27 +103,39 @@ static int udev_event_process(struct uevent_msg *msg)
        /* trigger timeout to prevent hanging processes */
        alarm(UDEV_ALARM_TIMEOUT);
 
-       /* reconstruct env from message */
+       /* reconstruct event environment from message */
        for (i = 0; msg->envp[i]; i++)
                putenv(msg->envp[i]);
 
-       udev_init_device(&udev, msg->devpath, msg->subsystem, msg->action);
-       retval = udev_process_event(&rules, &udev);
+       udev = udev_device_init();
+       if (udev == NULL)
+               return -1;
+       strlcpy(udev->action, msg->action, sizeof(udev->action));
+       sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem);
+       udev->devt = msg->devt;
+
+       retval = udev_device_event(&rules, udev);
 
        /* run programs collected by RUN-key*/
-       if (!retval) {
-               list_for_each_entry(name_loop, &udev.run_list, node) {
+       if (retval == 0) {
+               struct name_entry *name_loop;
+
+               list_for_each_entry(name_loop, &udev->run_list, node) {
                        if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
                                pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
-                       else
-                               if (run_program(name_loop->name, udev.subsystem, NULL, 0, NULL,
+                       else {
+                               char program[PATH_SIZE];
+
+                               strlcpy(program, name_loop->name, sizeof(program));
+                               apply_format(udev, program, sizeof(program));
+                               if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
                                                (udev_log_priority >= LOG_INFO)))
                                        retval = -1;
+                       }
                }
        }
 
-       udev_cleanup_device(&udev);
-
+       udev_device_cleanup(udev);
        return retval;
 }
 
@@ -176,6 +182,7 @@ static void export_event_state(struct uevent_msg *msg, enum event_state state)
        switch (state) {
        case EVENT_QUEUED:
                unlink(filename_failed);
+               delete_path(filename_failed);
 
                strlcpy(target, sysfs_path, sizeof(target));
                strlcat(target, msg->devpath, sizeof(target));
@@ -183,16 +190,26 @@ static void export_event_state(struct uevent_msg *msg, enum event_state state)
                symlink(target, filename);
                return;
        case EVENT_FINISHED:
+       case EVENT_FAILED:
                unlink(filename_failed);
+               delete_path(filename_failed);
 
-               /* don't remove if events for the same path are still pending */
+               /* don't remove, if events for the same path are still pending */
                list_for_each_entry(loop_msg, &running_list, node)
                        if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
                                return;
-               unlink(filename);
-       case EVENT_FAILED:
-               create_path(filename_failed);
-               rename(filename, filename_failed);
+
+               /* move failed events to the failed directory */
+               if (state == EVENT_FAILED) {
+                       create_path(filename_failed);
+                       rename(filename, filename_failed);
+               } else {
+                       unlink(filename);
+               }
+
+               /* clean up the queue directory */
+               delete_path(filename);
+
                return;
        }
 }
@@ -504,8 +521,8 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
        msg->envp[i++] = "UDEVD_EVENT=1";
        msg->envp[i] = NULL;
 
-       if (!msg->devpath) {
-               info("DEVPATH missing, ignore message");
+       if (msg->devpath == NULL || msg->action == NULL) {
+               info("DEVPATH or ACTION missing, ignore message");
                free(msg);
                return NULL;
        }
@@ -540,7 +557,7 @@ static struct uevent_msg *get_udevd_msg(void)
        size = recvmsg(udevd_sock, &smsg, 0);
        if (size <  0) {
                if (errno != EINTR)
-                       err("unable to receive udevd message: %s", strerror(errno));
+                       err("unable to receive user udevd message: %s", strerror(errno));
                return NULL;
        }
        cmsg = CMSG_FIRSTHDR(&smsg);
@@ -609,13 +626,13 @@ static struct uevent_msg *get_netlink_msg(void)
        struct uevent_msg *msg;
        int bufpos;
        ssize_t size;
-       static char buffer[UEVENT_BUFFER_SIZE + 512];
+       static char buffer[UEVENT_BUFFER_SIZE+512];
        char *pos;
 
        size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
        if (size <  0) {
                if (errno != EINTR)
-                       err("unable to receive udevd message: %s", strerror(errno));
+                       err("unable to receive kernel netlink message: %s", strerror(errno));
                return NULL;
        }
 
@@ -808,7 +825,7 @@ int main(int argc, char *argv[], char *envp[])
        if (fd < 0)
                err("fatal, could not open /dev/null: %s", strerror(errno));
 
-       udev_init_config();
+       udev_config_init();
        dbg("version %s", UDEV_VERSION);
 
        if (getuid() != 0) {
@@ -848,6 +865,7 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        /* parse the rules and keep it in memory */
+       sysfs_init();
        udev_rules_init(&rules, 1);
 
        if (daemonize) {
@@ -968,13 +986,8 @@ int main(int argc, char *argv[], char *envp[])
                /* get user socket message */
                if (FD_ISSET(udevd_sock, &readfds)) {
                        msg = get_udevd_msg();
-                       if (msg) {
-                               if (msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
-                                       info("skip non-kernel message with SEQNUM");
-                                       free(msg);
-                               } else
-                                       msg_queue_insert(msg);
-                       }
+                       if (msg)
+                               msg_queue_insert(msg);
                }
 
                /* get kernel netlink message */
@@ -1014,7 +1027,7 @@ int main(int argc, char *argv[], char *envp[])
                /* rules changed, set by inotify or a signal*/
                if (reload_config) {
                        reload_config = 0;
-                       udev_rules_close(&rules);
+                       udev_rules_cleanup(&rules);
                        udev_rules_init(&rules, 1);
                }
 
@@ -1032,7 +1045,8 @@ int main(int argc, char *argv[], char *envp[])
        }
 
 exit:
-       udev_rules_close(&rules);
+       udev_rules_cleanup(&rules);
+       sysfs_cleanup();
 
        if (signal_pipe[READ_END] > 0)
                close(signal_pipe[READ_END]);