X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevd.c;h=258d7870ebf84f11cf89105296b21f2479fe928e;hb=2738ec2cf721db0c0deac2ba0abdc73cf7739e9f;hp=0e73f81069630541bb4e7a53d3657446782466be;hpb=b466e9ab3951207a3c0c8d2ba6167be1eac1e41a;p=elogind.git

diff --git a/udev/udevd.c b/udev/udevd.c
index 0e73f8106..258d7870e 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -809,24 +809,29 @@ static void handle_signal(struct udev *udev, int signo)
 
 				if (worker->pid != pid)
 					continue;
-
 				info(udev, "worker [%u] exit\n", pid);
-				if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-					if (WEXITSTATUS(status))
-						err(udev, "worker [%u] unexpectedly returned with status %d\n", pid, WEXITSTATUS(status));
-					else if (WIFSIGNALED(status))
-					  err(udev, "worker [%u] killed by signal %d (%s)\n", pid, 
-					      WTERMSIG(status), strsignal(WTERMSIG(status)));
-					else if (WIFSTOPPED(status))
-						err(udev, "worker [%u] unexpectedly stopped\n", pid);
-					else if (WIFCONTINUED(status))
-						err(udev, "worker [%u] continued\n", pid);
 
+				if (WIFEXITED(status)) {
+					if (WEXITSTATUS(status) != 0)
+						err(udev, "worker [%u] exit with return code %i\n", pid, WEXITSTATUS(status));
+				} else if (WIFSIGNALED(status)) {
+					err(udev, "worker [%u] terminated by signal %i (%s)\n",
+					    pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+				} else if (WIFSTOPPED(status)) {
+					err(udev, "worker [%u] stopped\n", pid);
+				} else if (WIFCONTINUED(status)) {
+					err(udev, "worker [%u] continued\n", pid);
+				} else {
+					err(udev, "worker [%u] exit with status 0x%04x\n", pid, status);
+				}
+
+				if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
 					if (worker->event != NULL) {
-						err(udev, "worker [%u] failed while handling '%s'\n", pid, worker->event->devpath);
+						err(udev, "worker [%u] failed while handling '%s'\n",
+						    pid, worker->event->devpath);
 						worker->event->exitcode = -32;
 						event_queue_delete(worker->event, true);
-						/* drop reference from running event */
+						/* drop reference taken for state 'running' */
 						worker_unref(worker);
 					}
 				}
@@ -1403,6 +1408,13 @@ int main(int argc, char *argv[])
 
 	udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024);
 
+	/* create queue file before signalling 'ready', to make sure we block 'settle' */
+	udev_queue_export = udev_queue_export_new(udev);
+	if (udev_queue_export == NULL) {
+		err(udev, "error creating queue file\n");
+		goto exit;
+	}
+
 	if (daemonize) {
 		pid_t pid;
 		int fd;
@@ -1416,8 +1428,8 @@ int main(int argc, char *argv[])
 			rc = 4;
 			goto exit;
 		default:
-			rc = 0;
-			goto exit;
+			rc = EXIT_SUCCESS;
+			goto exit_keep_queue;
 		}
 
 		setsid();
@@ -1516,12 +1528,6 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	udev_queue_export = udev_queue_export_new(udev);
-	if (udev_queue_export == NULL) {
-		err(udev, "error creating queue file\n");
-		goto exit;
-	}
-
 	memset(&ep_ctrl, 0, sizeof(struct epoll_event));
 	ep_ctrl.events = EPOLLIN;
 	ep_ctrl.data.fd = fd_ctrl;
@@ -1703,9 +1709,10 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	udev_queue_export_cleanup(udev_queue_export);
-	rc = 0;
+	rc = EXIT_SUCCESS;
 exit:
+	udev_queue_export_cleanup(udev_queue_export);
+exit_keep_queue:
 	if (fd_ep >= 0)
 		close(fd_ep);
 	worker_list_cleanup(udev);