[PATCH] update udev.rules.gentoo with new config file format.

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index f6de88565f073ee57a9d486bdb2ebd19fe390f65..b5850294aef18aa1cf7fa42fe5456c783bd9d25f 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -40,7 +40,17 @@
 #include "udevd.h"
 #include "logging.h"
 
+#ifdef LOG
 unsigned char logname[42];
+void log_message (int level, const char *format, ...)
+{
+       va_list args;
+
+       va_start(args, format);
+       vsyslog(level, format, args);
+       va_end(args);
+}
+#endif
 
 static inline char *get_action(void)
 {
@@ -114,7 +124,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 +142,35 @@ int main(int argc, char* argv[])
 #ifdef DEBUG
        init_logging("udevsend");
 #endif
+       dbg("version %s", UDEV_VERSION);
 
        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 +184,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;