[PATCH] fix NAME="foo-%c{N}" gets a truncated name

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index 223647785d73a17af57fbf0b3481550e35e95dcc..4b6ef5c2f3b7f8929678d85ecd6524cf07113765 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -29,40 +29,28 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
+#include <linux/stddef.h>
 
 #include "udev.h"
 #include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"
 
+#ifdef LOG
 unsigned char logname[42];
-
-static inline char *get_action(void)
+void log_message (int level, const char *format, ...)
 {
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       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)
@@ -70,9 +58,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);
 }
 
@@ -112,48 +100,55 @@ 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;
        char *seqnum;
        int seq;
-       int retval = -EINVAL;
+       int retval = 1;
        int size;
        int loop;
        struct timespec tspec;
        int sock;
        struct sockaddr_un saddr;
+       socklen_t addrlen;
+       int started_daemon = 0;
 
 #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 = 0;
+               seq = -1;
        else
                seq = atoi(seqnum);
+       dbg("SEQNUM = '%d'", seq);
 
-       sock = socket(AF_LOCAL, SOCK_STREAM, 0);
+       sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (sock == -1) {
                dbg("error getting socket");
                goto exit;
@@ -163,49 +158,44 @@ int main(int argc, char* argv[])
        saddr.sun_family = AF_LOCAL;
        /* use abstract namespace for socket path */
        strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
+       addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
-       /* try to connect, if it fails start daemon */
-       retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
-       if (retval != -1) {
-               goto send;
-       } else {
-               dbg("connect failed, try starting daemon...");
-               retval = start_daemon();
-               if (retval == 0) {
-                       dbg("daemon started");
-               } else {
-                       dbg("error starting daemon");
-                       goto exit;
-               }
-       }
+       size = build_hotplugmsg(&msg, action, devpath, subsystem, seq);
 
-       /* try to connect while daemon to starts */
-       tspec.tv_sec = 0;
-       tspec.tv_nsec = 100000000;  /* 100 millisec */
+       /* If we can't send, try to start daemon and resend message */
        loop = UDEVSEND_CONNECT_RETRY;
        while (loop--) {
-               retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
-               if (retval != -1)
-                       goto send;
-               else
-                       dbg("retry to connect %d",
-                           UDEVSEND_CONNECT_RETRY - loop);
-               nanosleep(&tspec, NULL);
-       }
-       dbg("error connecting to daemon, start daemon failed");
-       goto exit;
-
-send:
-       size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
-       retval = send(sock, &message, size, 0);
-       if (retval == -1) {
-               dbg("error sending message");
-               close (sock);
-               goto exit;
+               retval = sendto(sock, &msg, size, 0, (struct sockaddr *)&saddr, addrlen);
+               if (retval != -1) {
+                       retval = 0;
+                       goto close_and_exit;
+               }
+               
+               if (errno != ECONNREFUSED) {
+                       dbg("error sending message");
+                       goto close_and_exit;
+               }
+               
+               if (!started_daemon) {
+                       dbg("connect failed, try starting daemon...");
+                       retval = start_daemon();
+                       if (retval) {
+                               dbg("error starting daemon");
+                               goto exit;
+                       }
+                       
+                       dbg("daemon started");
+                       started_daemon = 1;
+               } else {
+                       dbg("retry to connect %d", UDEVSEND_CONNECT_RETRY - loop);
+                       tspec.tv_sec = 0;
+                       tspec.tv_nsec = 100000000;  /* 100 millisec */
+                       nanosleep(&tspec, NULL);
+               }
        }
-       close (sock);
-       return 0;
-
+       
+close_and_exit:
+       close(sock);
 exit:
-       return 1;
+       return retval;
 }