X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=ff61c656c872c3d834efef79f6be1604136f9953;hp=b7b306131ee5e490f065a4d0a828e84bff8eeb15;hb=632b682b2a1b4b71500a633369668b0cc7379bcd;hpb=f4fc0136523afdc3ace865312f816c53694a6b87

diff --git a/udevd.c b/udevd.c
index b7b306131..ff61c656c 100644
--- a/udevd.c
+++ b/udevd.c
@@ -133,9 +133,91 @@ static int udev_event_process(struct uevent_msg *msg)
 	return retval;
 }
 
+enum event_state {
+	EVENT_QUEUED,
+	EVENT_FINISHED,
+	EVENT_FAILED,
+};
+
+static void export_event_state(struct uevent_msg *msg, enum event_state state)
+{
+	char filename[PATH_SIZE];
+	char filename_failed[PATH_SIZE];
+	char target[PATH_SIZE];
+	size_t start, end, i;
+	struct uevent_msg *loop_msg;
+
+	/* add location of queue files */
+	strlcpy(filename, udev_root, sizeof(filename));
+	strlcat(filename, "/", sizeof(filename));
+	start = strlcat(filename, EVENT_QUEUE_DIR, sizeof(filename));
+	end = strlcat(filename, msg->devpath, sizeof(filename));
+	if (end > sizeof(filename))
+		end = sizeof(filename);
+
+	/* replace '/' to transform path into a filename */
+	for (i = start+1; i < end; i++)
+		if (filename[i] == '/')
+			filename[i] = PATH_TO_NAME_CHAR;
+
+	/* add location of failed files */
+	strlcpy(filename_failed, udev_root, sizeof(filename_failed));
+	strlcat(filename_failed, "/", sizeof(filename_failed));
+	start = strlcat(filename_failed, EVENT_FAILED_DIR, sizeof(filename_failed));
+	end = strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
+	if (end > sizeof(filename_failed))
+		end = sizeof(filename_failed);
+
+	/* replace '/' to transform path into a filename */
+	for (i = start+1; i < end; i++)
+		if (filename_failed[i] == '/')
+			filename_failed[i] = PATH_TO_NAME_CHAR;
+
+	switch (state) {
+	case EVENT_QUEUED:
+		unlink(filename_failed);
+		delete_path(filename_failed);
+
+		strlcpy(target, sysfs_path, sizeof(target));
+		strlcat(target, msg->devpath, sizeof(target));
+		create_path(filename);
+		symlink(target, filename);
+		return;
+	case EVENT_FINISHED:
+	case EVENT_FAILED:
+		unlink(filename_failed);
+		delete_path(filename_failed);
+
+		/* don't remove, if events for the same path are still pending */
+		list_for_each_entry(loop_msg, &running_list, node)
+			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+				return;
+
+		/* move failed events to the failed directory */
+		if (state == EVENT_FAILED) {
+			create_path(filename_failed);
+			rename(filename, filename_failed);
+		} else {
+			unlink(filename);
+		}
+
+		/* clean up the queue directory */
+		delete_path(filename);
+
+		return;
+	}
+}
+
 static void msg_queue_delete(struct uevent_msg *msg)
 {
 	list_del(&msg->node);
+
+	/* mark as failed, if add event returns non-zero */
+	if (msg->exitstatus && strcmp(msg->action, "add") == 0)
+		export_event_state(msg, EVENT_FAILED);
+	else
+		export_event_state(msg, EVENT_FINISHED);
+
 	free(msg);
 }
 
@@ -181,6 +263,8 @@ static void msg_queue_insert(struct uevent_msg *msg)
 {
 	msg->queue_time = time(NULL);
 
+	export_event_state(msg, EVENT_QUEUED);
+
 	/* run all events with a timeout set immediately */
 	if (msg->timeout != 0) {
 		list_add_tail(&msg->node, &running_list);
@@ -467,7 +551,7 @@ static struct uevent_msg *get_udevd_msg(void)
 	size = recvmsg(udevd_sock, &smsg, 0);
 	if (size <  0) {
 		if (errno != EINTR)
-			err("unable to receive udevd message: %s", strerror(errno));
+			err("unable to receive user udevd message: %s", strerror(errno));
 		return NULL;
 	}
 	cmsg = CMSG_FIRSTHDR(&smsg);
@@ -542,7 +626,7 @@ static struct uevent_msg *get_netlink_msg(void)
 	size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
 	if (size <  0) {
 		if (errno != EINTR)
-			err("unable to receive udevd message: %s", strerror(errno));
+			err("unable to receive kernel netlink message: %s", strerror(errno));
 		return NULL;
 	}
 
@@ -632,6 +716,8 @@ static void reap_sigchilds(void)
 			break;
 		if (WIFEXITED(status))
 			status = WEXITSTATUS(status);
+		else if (WIFSIGNALED(status))
+			status = WTERMSIG(status) + 128;
 		else
 			status = 0;
 		udev_done(pid, status);
@@ -893,13 +979,8 @@ int main(int argc, char *argv[], char *envp[])
 		/* get user socket message */
 		if (FD_ISSET(udevd_sock, &readfds)) {
 			msg = get_udevd_msg();
-			if (msg) {
-				if (msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
-					info("skip non-kernel message with SEQNUM");
-					free(msg);
-				} else
-					msg_queue_insert(msg);
-			}
+			if (msg)
+				msg_queue_insert(msg);
 		}
 
 		/* get kernel netlink message */