[PATCH] udev_dbus changes

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 301625fd927a58e7868cf1da31551a3d993f7e4a..b2cb62f386c4d7a7b0383161fe629dad963e7eb1 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -73,6 +73,10 @@ void log_message (int level, const char *format, ...)
 }
 #endif
 
+#define msg_dump(msg) \
+       dbg("msg_dump: sequence %d, '%s', '%s', '%s'", \
+       msg->seqnum, msg->action, msg->devpath, msg->subsystem);
+
 static void msg_dump_queue(void)
 {
 #ifdef DEBUG
@@ -83,12 +87,6 @@ static void msg_dump_queue(void)
 #endif
 }
 
-static void msg_dump(struct hotplug_msg *msg)
-{
-       dbg("sequence %d, '%s', '%s', '%s'",
-           msg->seqnum, msg->action, msg->devpath, msg->subsystem);
-}
-
 static struct hotplug_msg *msg_create(void)
 {
        struct hotplug_msg *new_msg;
@@ -139,8 +137,10 @@ static void udev_run(struct hotplug_msg *msg)
        char devpath[DEVPATH_SIZE];
        char *env[] = { action, devpath, NULL };
 
-       snprintf(action, sizeof(action), "ACTION=%s", msg->action);
-       snprintf(devpath, sizeof(devpath), "DEVPATH=%s", msg->devpath);
+       strcpy(action, "ACTION=");
+       strfieldcat(action, msg->action);
+       strcpy(devpath, "DEVPATH=");
+       strfieldcat(devpath, msg->devpath);
 
        pid = fork();
        switch (pid) {