substitute format chars in RUN after rule matching

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index f64a4252bbbb5ea018e53a88abc7fd509d52020e..8a352e1eb9f52b07f4d9b6cd71d09e16e94eb158 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -123,10 +123,15 @@ static int udev_event_process(struct uevent_msg *msg)
                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->dev->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;
+                       }
                }
        }
 
@@ -516,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;
        }
@@ -621,7 +626,7 @@ 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);