X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevd.c;h=25ef857a8cc177f5099836ce73b0972bfdc7db50;hb=8d1425d54717b9b9ec06efdd1dd25559445e2571;hp=e1afb7622b115fe1519a9f5ae42481fde525532c;hpb=fc55cf68ca0c0db5172a9de7e827c6c3f7c2a308;p=elogind.git

diff --git a/udevd.c b/udevd.c
index e1afb7622..25ef857a8 100644
--- a/udevd.c
+++ b/udevd.c
@@ -176,6 +176,7 @@ static void export_event_state(struct uevent_msg *msg, enum event_state state)
 	switch (state) {
 	case EVENT_QUEUED:
 		unlink(filename_failed);
+		delete_path(filename_failed);
 
 		strlcpy(target, sysfs_path, sizeof(target));
 		strlcat(target, msg->devpath, sizeof(target));
@@ -183,16 +184,26 @@ static void export_event_state(struct uevent_msg *msg, enum event_state state)
 		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 */
+		/* 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;
-		unlink(filename);
-	case EVENT_FAILED:
-		create_path(filename_failed);
-		rename(filename, filename_failed);
+
+		/* 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;
 	}
 }
@@ -705,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);