commit a523d270f0229581bdb138c7324f3f7379f381b5
from: claudio <claudio@openbsd.org>
date: Thu Nov 21 13:21:33 2024 UTC

Convert the common imsgbuf_read calls to the post EAGAIN world.

OK tb@

commit - 4fa30ed3b5f0dc15e8df1354524856babc892291
commit + a523d270f0229581bdb138c7324f3f7379f381b5
blob - 864ee775fd53ccf0c7646bbfd2a6ffa2899b515e
blob + e54259c5971368631ee256302915d9d0e4b62c54
--- ca.c
+++ ca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ca.c,v 1.44 2024/11/21 13:17:02 claudio Exp $	*/
+/*	$OpenBSD: ca.c,v 1.45 2024/11/21 13:21:34 claudio Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -357,7 +357,7 @@ rsae_send_imsg(int flen, const u_char *from, u_char *t
 		default:
 			break;
 		}
-		if ((n = imsgbuf_read(ibuf)) == -1 && errno != EAGAIN)
+		if ((n = imsgbuf_read(ibuf)) == -1)
 			fatalx("imsgbuf_read");
 		if (n == 0)
 			fatalx("pipe closed");
blob - d88cf0b00a23afdb8ad2b44ea63a3fc0f348b2dd
blob + 828b83e8cdfc217f70dbc2254c5ed0b85b6544b9
--- control.c
+++ control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.62 2024/11/21 13:17:58 claudio Exp $	*/
+/*	$OpenBSD: control.c,v 1.63 2024/11/21 13:21:34 claudio Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -231,8 +231,7 @@ control_dispatch_imsg(int fd, short event, void *arg)
 	}
 
 	if (event & EV_READ) {
-		if (((n = imsgbuf_read(&c->iev.ibuf)) == -1 &&
-		    errno != EAGAIN) || n == 0) {
+		if (imsgbuf_read(&c->iev.ibuf) != 1) {
 			control_close(fd, cs);
 			return;
 		}
blob - 85a00980a31de1b14de87e1d4ab400297037d7a6
blob + 253a907ccc1c7f8abca601cb1c861b730c575b05
--- proc.c
+++ proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.50 2024/11/21 13:18:38 claudio Exp $	*/
+/*	$OpenBSD: proc.c,v 1.51 2024/11/21 13:21:34 claudio Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -602,7 +602,7 @@ proc_dispatch(int fd, short event, void *arg)
 	ibuf = &iev->ibuf;
 
 	if (event & EV_READ) {
-		if ((n = imsgbuf_read(ibuf)) == -1 && errno != EAGAIN)
+		if ((n = imsgbuf_read(ibuf)) == -1)
 			fatal("%s: imsgbuf_read", __func__);
 		if (n == 0) {
 			/* this pipe is dead, so remove the event handler */