Commit Diff

Commit:
63ca1296237357eb9917f051f6b3fbfedeb68440
From:
claudio <claudio@openbsd.org>
Date:
Message:
imsg_flush no longer returns EAGAIN. Simplify proc_flush_imsg() accordingly. Issue spotted by op@
Actions:
Patch | Tree
commit - 311b16add548240ef3b56166d4d36e9373457bf9
commit + 63ca1296237357eb9917f051f6b3fbfedeb68440
blob - 6b0461eaf1eac6be1927fc57e88f8be118189d0e
blob + 73dabf2670b11841ac21b96fc6506dd9e6f552b6
--- proc.c
+++ proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.45 2024/04/09 15:48:01 tobhe Exp $	*/
+/*	$OpenBSD: proc.c,v 1.46 2024/11/21 13:06:25 claudio Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -817,10 +817,7 @@ proc_flush_imsg(struct privsep *ps, enum privsep_proci
 	for (; n < m; n++) {
 		if ((ibuf = proc_ibuf(ps, id, n)) == NULL)
 			return (-1);
-		do {
-			ret = imsg_flush(ibuf);
-		} while (ret == -1 && errno == EAGAIN);
-		if (ret == -1)
+		if ((ret = imsg_flush(ibuf)) == -1)
 			break;
 		imsg_event_add(&ps->ps_ievs[id][n]);
 	}