[PATCH] udevd race conditions and performance, assorted cleanups

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index f6de88565f073ee57a9d486bdb2ebd19fe390f65..f1c46d33672e918bb548c798a84265e65b51390a 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -36,35 +36,22 @@
 #include <linux/stddef.h>
 
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"
 
-unsigned char logname[42];
-
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message (int level, const char *format, ...)
 {
-       char *devpath;
+       va_list args;
 
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
+       va_start(args, format);
+       vsyslog(level, format, args);
+       va_end(args);
 }
+#endif
 
 static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
                            char *devpath, char *subsystem, int seqnum)
@@ -72,9 +59,9 @@ static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
        memset(msg, 0x00, sizeof(*msg));
        strfieldcpy(msg->magic, UDEV_MAGIC);
        msg->seqnum = seqnum;
-       strncpy(msg->action, action, 8);
-       strncpy(msg->devpath, devpath, 128);
-       strncpy(msg->subsystem, subsystem, 16);
+       strfieldcpy(msg->action, action);
+       strfieldcpy(msg->devpath, devpath);
+       strfieldcpy(msg->subsystem, subsystem);
        return sizeof(struct hotplug_msg);
 }
 
@@ -114,7 +101,7 @@ static int start_daemon(void)
 
 int main(int argc, char* argv[])
 {
-       struct hotplug_msg message;
+       struct hotplug_msg msg;
        char *action;
        char *devpath;
        char *subsystem;
@@ -132,30 +119,35 @@ int main(int argc, char* argv[])
 #ifdef DEBUG
        init_logging("udevsend");
 #endif
+       dbg("version %s", UDEV_VERSION);
 
-       subsystem = argv[1];
+       subsystem = get_subsystem(argv[1]);
        if (subsystem == NULL) {
                dbg("no subsystem");
                goto exit;
        }
+       dbg("subsystem = '%s'", subsystem);
 
        devpath = get_devpath();
        if (devpath == NULL) {
                dbg("no devpath");
                goto exit;
        }
+       dbg("DEVPATH = '%s'", devpath);
 
        action = get_action();
        if (action == NULL) {
                dbg("no action");
                goto exit;
        }
+       dbg("ACTION = '%s'", action);
 
        seqnum = get_seqnum();
        if (seqnum == NULL)
                seq = -1;
        else
                seq = atoi(seqnum);
+       dbg("SEQNUM = '%d'", seq);
 
        sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (sock == -1) {
@@ -169,12 +161,12 @@ int main(int argc, char* argv[])
        strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
        addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
-       size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
-       
+       size = build_hotplugmsg(&msg, action, devpath, subsystem, seq);
+
        /* If we can't send, try to start daemon and resend message */
        loop = UDEVSEND_CONNECT_RETRY;
        while (loop--) {
-               retval = sendto(sock, &message, size, 0, (struct sockaddr*)&saddr, addrlen);
+               retval = sendto(sock, &msg, size, 0, (struct sockaddr *)&saddr, addrlen);
                if (retval != -1) {
                        retval = 0;
                        goto close_and_exit;