X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=f1c46d33672e918bb548c798a84265e65b51390a;hp=b2fbcbbca6f20139bbf6312703f34623fd7670cf;hb=f27125f98f6487e881a957726da895aebd799f0d;hpb=7b1cbec91a51a8d8f1546935d942744b0f5a274e

diff --git a/udevsend.c b/udevsend.c
index b2fbcbbca..f1c46d336 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -36,40 +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];
-
-int log_ok(void)
-{
-	return 1;
-}
-
-static inline char *get_action(void)
-{
-	char *action;
-
-	action = getenv("ACTION");
-	return action;
-}
-
-static inline char *get_devpath(void)
-{
-	char *devpath;
-
-	devpath = getenv("DEVPATH");
-	return devpath;
-}
-
-static inline char *get_seqnum(void)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message (int level, const char *format, ...)
 {
-	char *seqnum;
+	va_list	args;
 
-	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)
@@ -77,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);
 }
 
@@ -137,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) {