X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=d0cfc2af53894b309c530325e2b5d78e4f017519;hp=2b92e659e2f2a09010f8ffaf96acf6264436d123;hb=f4fc0136523afdc3ace865312f816c53694a6b87;hpb=3b47c7394d042b8a3fcf426920a926d4ffedacad

diff --git a/udevsend.c b/udevsend.c
index 2b92e659e..d0cfc2af5 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -1,12 +1,9 @@
 /*
  * udevsend.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
- *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
  *	Free Software Foundation version 2 of the License.
@@ -22,17 +19,17 @@
  *
  */
 
-#include <sys/types.h>
-#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 <string.h>
+#include <time.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
 #include <linux/stddef.h>
 
 #include "udev.h"
@@ -74,17 +71,17 @@ static int start_daemon(void)
 			/* daemon with empty environment */
 			close(sock);
 			execve(UDEVD_BIN, argv, envp);
-			err("exec of daemon failed");
+			err("exec of daemon failed: %s", strerror(errno));
 			_exit(1);
 		case -1:
-			err("fork of daemon failed");
+			err("fork of daemon failed: %s", strerror(errno));
 			return -1;
 		default:
 			exit(0);
 		}
 		break;
 	case -1:
-		err("fork of helper failed");
+		err("fork of helper failed: %s", strerror(errno));
 		return -1;
 	default:
 		waitpid(pid, NULL, 0);
@@ -92,27 +89,6 @@ static int start_daemon(void)
 	return 0;
 }
 
-static void run_udev(const char *subsystem)
-{
-	char *const argv[] = { "udev", (char *)subsystem, NULL };
-	pid_t pid;
-
-	pid = fork();
-	switch (pid) {
-	case 0:
-		/* child */
-		execv(UDEV_BIN, argv);
-		err("exec of udev child failed");
-		_exit(1);
-		break;
-	case -1:
-		err("fork of udev child failed");
-		break;
-	default:
-		waitpid(pid, NULL, 0);
-	}
-}
-
 int main(int argc, char *argv[], char *envp[])
 {
 	static struct udevd_msg usend_msg;
@@ -134,8 +110,8 @@ int main(int argc, char *argv[], char *envp[])
 
 	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 	if (sock == -1) {
-		err("error getting socket");
-		goto fallback;
+		err("error getting socket: %s", strerror(errno));
+		goto exit;
 	}
 
 	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
@@ -146,7 +122,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
 	strcpy(usend_msg.magic, UDEV_MAGIC);
-	usend_msg.type = UDEVD_UEVENT;
+	usend_msg.type = UDEVD_UEVENT_UDEVSEND;
 
 	/* copy all keys to send buffer */
 	for (i = 0; envp[i]; i++) {
@@ -185,7 +161,7 @@ int main(int argc, char *argv[], char *envp[])
 	dbg("usend_msg_len=%i", usend_msg_len);
 
 	/* If we can't send, try to start daemon and resend message */
-	loop = SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND;
+	loop = UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND;
 	while (--loop) {
 		retval = sendto(sock, &usend_msg, usend_msg_len, 0, (struct sockaddr *)&saddr, addrlen);
 		if (retval != -1) {
@@ -194,8 +170,8 @@ int main(int argc, char *argv[], char *envp[])
 		}
 
 		if (errno != ECONNREFUSED) {
-			err("error sending message (%s)", strerror(errno));
-			goto fallback;
+			err("error sending message: %s", strerror(errno));
+			goto exit;
 		}
 
 		if (!started_daemon) {
@@ -203,20 +179,16 @@ int main(int argc, char *argv[], char *envp[])
 			retval = start_daemon();
 			if (retval) {
 				dbg("error starting daemon");
-				goto fallback;
+				goto exit;
 			}
 			dbg("udevd daemon started");
 			started_daemon = 1;
 		} else {
-			dbg("retry to connect %d", SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND - loop);
-			usleep(1000 * 1000 / SEND_WAIT_LOOP_PER_SECOND);
+			dbg("retry to connect %d", UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND - loop);
+			usleep(1000 * 1000 / UDEVSEND_WAIT_LOOP_PER_SECOND);
 		}
 	}
 
-fallback:
-	err("unable to connect to event daemon, try to call udev directly");
-	run_udev(subsystem);
-
 exit:
 	if (sock != -1)
 		close(sock);