X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=f28e445433ab156caae58a7eb7b0a74d8f6bd482;hp=f6de88565f073ee57a9d486bdb2ebd19fe390f65;hb=5cd749f342ae95649a628668918e622b94bfdf4e;hpb=2f6cbd19113167746dc4fb6b4f3f5fd64a1c211f

diff --git a/udevsend.c b/udevsend.c
index f6de88565..f28e44543 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -26,56 +26,42 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/un.h>
+#include <time.h>
 #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_lib.h"
 #include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"
 
-unsigned char logname[42];
-
-static inline char *get_action(void)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+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)
+static void build_hotplugmsg(struct hotplug_msg *msg, char *action,
+			     char *devpath, char *subsystem, int seqnum)
 {
-	memset(msg, 0x00, sizeof(*msg));
+	memset(msg, 0x00, sizeof(struct hotplug_msg));
 	strfieldcpy(msg->magic, UDEV_MAGIC);
 	msg->seqnum = seqnum;
-	strncpy(msg->action, action, 8);
-	strncpy(msg->devpath, devpath, 128);
-	strncpy(msg->subsystem, subsystem, 16);
-	return sizeof(struct hotplug_msg);
+	strfieldcpy(msg->action, action);
+	strfieldcpy(msg->devpath, devpath);
+	strfieldcpy(msg->subsystem, subsystem);
 }
 
 static int start_daemon(void)
@@ -114,14 +100,13 @@ 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 = 1;
-	int size;
 	int loop;
 	struct timespec tspec;
 	int sock;
@@ -132,30 +117,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) {
@@ -163,18 +153,19 @@ int main(int argc, char* argv[])
 		goto exit;
 	}
 
-	memset(&saddr, 0x00, sizeof(saddr));
+	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
 	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;
 
-	size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
-	
+	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, sizeof(struct hotplug_msg), 0,
+				(struct sockaddr *)&saddr, addrlen);
 		if (retval != -1) {
 			retval = 0;
 			goto close_and_exit;