Commit Diff


commit - c2e060f1bec6c88445c73b44512cca72df00bd9aa1d7823353bb382a5563f479
commit + 4b701fe2e5f3aa348ccc3dcb07d1765220454cd9b0ef6d93e53d2322d9207f8c
blob - ae0df6591898b955614cd4066e227ae8b66ee22ab5e87fe3befcfa4804fc2504
blob + 7c6b1d630e07d97c4249e75224d32c15070407094659e6455ec6346ac87c023c
--- gotd/auth.c	
+++ gotd/auth.c	
@@ -345,8 +345,8 @@ auth_dispatch(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - bb6b2fe3a9f72ef4e2344976b12e15458378f3bfd13c82750e30e1526883e49a
blob + cad4bc20424dd758b54744eace53e36a9b1d6c02aa009f3c58c880a2dddeb10f
--- gotd/gotd.c	
+++ gotd/gotd.c	
@@ -686,8 +686,8 @@ gotd_dispatch_reload(int fd, short event, void *arg)
 	for (;;) {
 		const struct got_error *err = NULL;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -967,9 +967,9 @@ gotd_request(int fd, short events, void *arg)
 	}
 
 	while (err == NULL && !do_disconnect) {
-		n = imsg_get(ibuf, &imsg);
+		n = imsgbuf_get(ibuf, &imsg);
 		if (n == -1) {
-			err = got_error_from_errno("imsg_get");
+			err = got_error_from_errno("imsgbuf_get");
 			break;
 		}
 		if (n == 0)
@@ -1555,8 +1555,8 @@ gotd_dispatch_listener(int fd, short event, void *arg)
 		uint32_t client_id = 0;
 		int do_disconnect = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1840,8 +1840,8 @@ gotd_dispatch_notifier(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -2016,8 +2016,8 @@ gotd_dispatch_auth_child(int fd, short event, void *ar
 	if (client->auth->iev.ibuf.fd != fd)
 		fatalx("%s: unexpected fd %d", __func__, fd);
 
-	if ((n = imsg_get(ibuf, &imsg)) == -1)
-		fatal("%s: imsg_get error", __func__);
+	if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+		fatal("%s: imsgbuf_get error", __func__);
 	if (n == 0)	/* No more messages. */
 		return;
 
@@ -2222,8 +2222,8 @@ dispatch_gotsys_check(int fd, short event, void *arg)
 		const struct got_error *err = NULL;
 		int do_disconnect = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -2361,8 +2361,8 @@ dispatch_gotsys_apply(int fd, short event, void *arg)
 		const struct got_error *err = NULL;
 		int do_notify = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -2667,8 +2667,8 @@ gotd_dispatch_client_session(int fd, short event, void
 		int do_disconnect = 0, do_start_repo_child = 0;
 		int do_gotsys_check = 0, refs_updated = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -2950,8 +2950,8 @@ gotd_dispatch_repo_child(int fd, short event, void *ar
 		uint32_t client_id = 0;
 		int do_disconnect = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - a6e51fcc6fdcc9b123c51aafd94f513bdec209923966954b0d69aafe91a18ecf
blob + 79de21c623b4c681a38d9eaca1da38b6f3997505be2fb38c6ce0334bb11efba3
--- gotd/imsg.c	
+++ gotd/imsg.c	
@@ -44,9 +44,9 @@ gotd_imsg_recv(struct imsg *imsg, struct imsgbuf *ibuf
 {
 	ssize_t n;
 
-	n = imsg_get(ibuf, imsg);
+	n = imsgbuf_get(ibuf, imsg);
 	if (n == -1)
-		return got_error_from_errno("imsg_get");
+		return got_error_from_errno("imsgbuf_get");
 
 	if (n == 0) {
 		n = imsgbuf_read(ibuf);
@@ -54,9 +54,9 @@ gotd_imsg_recv(struct imsg *imsg, struct imsgbuf *ibuf
 			return got_error_from_errno("imsgbuf_read");
 		if (n == 0)
 			return got_error(GOT_ERR_EOF);
-		n = imsg_get(ibuf, imsg);
+		n = imsgbuf_get(ibuf, imsg);
 		if (n == -1)
-			return got_error_from_errno("imsg_get");
+			return got_error_from_errno("imsgbuf_get");
 		if (n == 0)
 			return got_error(GOT_ERR_PRIVSEP_READ);
 	}
blob - 4f6b46578ae8f652b7fd0cf8b215fad66101ebed039fca9479bfc4753b999a1a
blob + 1eab4398369b363f6aabbf443772d5f39b5e84ac867f35d3cfc73180433d3163
--- gotd/libexec/gotsys-apply/gotsys-apply.c	
+++ gotd/libexec/gotsys-apply/gotsys-apply.c	
@@ -326,9 +326,9 @@ gotsys_apply(struct gotd_imsgev *iev)
 		goto done;
 	}
 
-	n = imsg_get(&ibuf, &imsg);
+	n = imsgbuf_get(&ibuf, &imsg);
 	if (n == -1) {
-		err = got_error_from_errno("imsg_get");
+		err = got_error_from_errno("imsgbuf_get");
 		goto done;
 	}
 	if (n == 0) {
@@ -415,8 +415,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	while (err == NULL && !flush_and_exit) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - 43c97427118da43c19f426995bd2739179b64e10353b26ef383570f7842d3f64
blob + d54cd1befe43859f4587fe4638ff2b2d08e4cf49d88fa40ac63651532a22fe0b
--- gotd/libexec/gotsys-check/gotsys-check.c	
+++ gotd/libexec/gotsys-check/gotsys-check.c	
@@ -184,8 +184,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	while (err == NULL && !flush_and_exit) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - 4de75a4589fe75023304fc076abd1114984de61eddcfbccc7f171f058802b5e0
blob + cc6111d4c5a11b7ec4f527b3a71ecb591bda91c38106394a600f3c5816ee47fc
--- gotd/listen.c	
+++ gotd/listen.c	
@@ -519,8 +519,8 @@ listen_dispatch(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - 8ef4f867ce1084f500b3605f03998361dd7b0b0df61ee4c8515205dfd39b25a0
blob + 48430c3f0058e1aeaa499503656c057f835e14f1f27e2d2850fd0b835428a0d8
--- gotd/notify.c	
+++ gotd/notify.c	
@@ -411,8 +411,8 @@ notify_dispatch_session(int fd, short event, void *arg
 	for (;;) {
 		const struct got_error *err = NULL;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -559,8 +559,8 @@ notify_dispatch(int fd, short event, void *arg)
 	for (;;) {
 		const struct got_error *err = NULL;
 
-		if ((n = imsg_get(imsgbuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - 3a0907099cdf22b0c93e7d0268348598b1c3b22423d9a627f3dd79fb0fd31a70
blob + 02cd56253f2dd0c14a944f1578fc47c2a4c309c2c8094ac8e2ac8cb5832eec5d
--- gotd/repo_read.c	
+++ gotd/repo_read.c	
@@ -704,8 +704,8 @@ repo_read_dispatch_session(int fd, short event, void *
 	}
 
 	while (err == NULL && check_cancelled(NULL) == NULL) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -825,8 +825,8 @@ repo_read_dispatch(int fd, short event, void *arg)
 	}
 
 	while (err == NULL && check_cancelled(NULL) == NULL) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - 7413161fcaddd63a0b9f7aff4325721b5d7cbf35020890e141d568cf0aed02df
blob + 2871469d3a30ddf761a12e18599bdc05c4f4266958df56708c99c0949ce4b4fd
--- gotd/repo_write.c	
+++ gotd/repo_write.c	
@@ -2664,8 +2664,8 @@ repo_write_dispatch_session(int fd, short event, void 
 	}
 
 	while (err == NULL) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -2849,8 +2849,8 @@ repo_write_dispatch(int fd, short event, void *arg)
 		err = check_cancelled(NULL);
 		if (err)
 			break;
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - fc845ead37a75eb918d8fd34c8d54afea43241b7d6ab8940eaf2064c4c02d876
blob + 9b239cb8d7567b10aef60975aca0972ac47f76ccc680ae67e112e68091f8bb02
--- gotd/session_read.c	
+++ gotd/session_read.c	
@@ -226,8 +226,8 @@ session_dispatch_repo_child(int fd, short event, void 
 		uint32_t client_id = 0;
 		int do_disconnect = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -493,9 +493,9 @@ session_dispatch_client(int fd, short events, void *ar
 	}
 
 	while (err == NULL) {
-		n = imsg_get(ibuf, &imsg);
+		n = imsgbuf_get(ibuf, &imsg);
 		if (n == -1) {
-			err = got_error_from_errno("imsg_get");
+			err = got_error_from_errno("imsgbuf_get");
 			break;
 		}
 		if (n == 0)
@@ -794,8 +794,8 @@ session_dispatch(int fd, short event, void *arg)
 		uint32_t client_id = 0;
 		int do_disconnect = 0, do_list_refs = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - 791c67ff36bec9461c246bfe97c1ac4334e309f64609e2113ed4336de080e03b
blob + ae63cc7d6b7f1b806b4159522569979f8c192024b84b2f61ccda216072f104c1
--- gotd/session_write.c	
+++ gotd/session_write.c	
@@ -1045,8 +1045,8 @@ session_dispatch_repo_child(int fd, short event, void 
 		int packfile_verified = 0;
 		int do_packfile_install = 0, do_notify = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1454,9 +1454,9 @@ session_dispatch_client(int fd, short events, void *ar
 	}
 
 	while (err == NULL) {
-		n = imsg_get(ibuf, &imsg);
+		n = imsgbuf_get(ibuf, &imsg);
 		if (n == -1) {
-			err = got_error_from_errno("imsg_get");
+			err = got_error_from_errno("imsgbuf_get");
 			break;
 		}
 		if (n == 0)
@@ -1669,8 +1669,8 @@ session_dispatch_notifier(int fd, short event, void *a
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1846,8 +1846,8 @@ session_dispatch(int fd, short event, void *arg)
 		int do_disconnect = 0, do_list_refs = 0;
 		int send_notifications = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - 055731e3d48c50c842968fb9d0f24e82619e495cd1b0d4e7db65a75b175a1c6b
blob + 03dc0b7345c0a700b656ed190fc85d8c9f4ac37490059f528e95ddccda28c407
--- gotsys/gotsys.c	
+++ gotsys/gotsys.c	
@@ -386,9 +386,9 @@ cmd_apply(int argc, char *argv[])
 			goto done;
 		}
 
-		n = imsg_get(&ibuf, &imsg);
+		n = imsgbuf_get(&ibuf, &imsg);
 		if (n == -1) {
-			err = got_error_from_errno("imsg_get");
+			err = got_error_from_errno("imsgbuf_get");
 			goto done;
 		}
 		if (n == 0) {
blob - 54d1188907243eec12d98e76ac10ff6e741811484539c462f22f382a0548ecc5
blob + eaa1f8458f9ea7c302a662a4ea16ba30707d6c715eab72a118b021b3adc0e0d5
--- gotsysd/auth.c	
+++ gotsysd/auth.c	
@@ -253,8 +253,8 @@ auth_dispatch(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - 147b97d3fc60ddd245ad9de319d2ba1ef6fdafe411a356b1c0460570cadb9191
blob + fa1d68e7785b770d87e7c8e8ddfa6e3bd1276bb264b8ebac6faea3cfb46e2d28
--- gotsysd/gotsysd.c	
+++ gotsysd/gotsysd.c	
@@ -496,8 +496,8 @@ gotsysd_dispatch_sysconf_child(int fd, short event, vo
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -755,9 +755,9 @@ gotsysd_request(int fd, short events, void *arg)
 	}
 
 	while (err == NULL) {
-		n = imsg_get(ibuf, &imsg);
+		n = imsgbuf_get(ibuf, &imsg);
 		if (n == -1) {
-			err = got_error_from_errno("imsg_get");
+			err = got_error_from_errno("imsgbuf_get");
 			break;
 		}
 		if (n == 0)
@@ -869,8 +869,8 @@ gotsysd_dispatch_auth_child(int fd, short event, void 
 	if (client->auth->iev.ibuf.fd != fd)
 		fatalx("%s: unexpected fd %d", __func__, fd);
 
-	if ((n = imsg_get(ibuf, &imsg)) == -1)
-		fatal("%s: imsg_get error", __func__);
+	if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+		fatal("%s: imsgbuf_get error", __func__);
 	if (n == 0)	/* No more messages. */
 		return;
 
@@ -1115,8 +1115,8 @@ gotsysd_dispatch_listener(int fd, short event, void *a
 		uint32_t client_id = 0;
 		int do_disconnect = 0;
 
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1290,8 +1290,8 @@ gotsysd_dispatch_priv(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1379,8 +1379,8 @@ gotsysd_dispatch_libexec(int fd, short event, void *ar
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - e3dbb129b622c1c7f4e94b03352ad3639c8950bf148492391452b9cd0749931a
blob + c1f4bd95090512a2d798ee060c4102278387cf5fee7a0cfbec96cbdb88a78e71
--- gotsysd/helpers.c	
+++ gotsysd/helpers.c	
@@ -549,8 +549,8 @@ dispatch_helper_child(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -878,8 +878,8 @@ helpers_dispatch_sysconf(int fd, short event, void *ar
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1194,8 +1194,8 @@ helpers_dispatch(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - d474f74bcfb233ddfc61c45b045e8a1d5d6d82f1271b48114c3830de61decd2e
blob + d5ada3c1501ccb104713240b1c9631151389fe293c8b07bc380b44df25531451
--- gotsysd/imsg.c	
+++ gotsysd/imsg.c	
@@ -82,9 +82,9 @@ gotsysd_imsg_recv(struct imsg *imsg, struct imsgbuf *i
 {
 	ssize_t n;
 
-	n = imsg_get(ibuf, imsg);
+	n = imsgbuf_get(ibuf, imsg);
 	if (n == -1)
-		return got_error_from_errno("imsg_get");
+		return got_error_from_errno("imsgbuf_get");
 
 	if (n == 0) {
 		n = imsgbuf_read(ibuf);
@@ -92,9 +92,9 @@ gotsysd_imsg_recv(struct imsg *imsg, struct imsgbuf *i
 			return got_error_from_errno("imsgbuf_read");
 		if (n == 0)
 			return got_error(GOT_ERR_EOF);
-		n = imsg_get(ibuf, imsg);
+		n = imsgbuf_get(ibuf, imsg);
 		if (n == -1)
-			return got_error_from_errno("imsg_get");
+			return got_error_from_errno("imsgbuf_get");
 		if (n == 0)
 			return got_error(GOT_ERR_PRIVSEP_READ);
 	}
blob - 854adb4eba358d8c468beffc28477659faace5b6690b7cac43110d5c6e78e1d2
blob + 0537da2b6f1a20571633c40161fe9a2f705ac2a5ab41f3d003228946dc669429
--- gotsysd/libexec/gotsys-apply-conf/gotsys-apply-conf.c	
+++ gotsysd/libexec/gotsys-apply-conf/gotsys-apply-conf.c	
@@ -145,8 +145,8 @@ dispatch_gotd(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
@@ -212,8 +212,8 @@ dispatch_gotsysd(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - 41f72a4bb56089f6eefde884ea85245abbc5f430646e9a8cc2c8e25c23ba6b1c
blob + 68321fcf20ab1ba9b6a1700359c3d3cba567fdd17643f1155a42a107cd684fb3
--- gotsysd/libexec/gotsys-apply-webconf/gotsys-apply-webconf.c	
+++ gotsysd/libexec/gotsys-apply-webconf/gotsys-apply-webconf.c	
@@ -195,8 +195,8 @@ dispatch_gotwebd(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto loopexit;
 		}
 		if (n == 0)	/* No more messages. */
@@ -275,8 +275,8 @@ dispatch_gotsysd(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto loopexit;
 		}
 		if (n == 0)	/* No more messages. */
blob - c3d8f662195facdf6d658a7422b3c802cf1f6a6a4e1c342b6df4470d811945b7
blob + d25febab28f777451d948273d1e4c9d012cb23185b749fe65c612f34fdfe1d4b
--- gotsysd/libexec/gotsys-groupadd/gotsys-groupadd.c	
+++ gotsysd/libexec/gotsys-groupadd/gotsys-groupadd.c	
@@ -502,8 +502,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - bf7ba5f8383ce26cfa21e7925e63fc0e393b55262039b69b90b606e4fa7a640e
blob + abcedff785017ace4e32a826ac1783499f6d02fa71c13a794a5f7c6b2e56c6d3
--- gotsysd/libexec/gotsys-read-conf/gotsys-read-conf.c	
+++ gotsysd/libexec/gotsys-read-conf/gotsys-read-conf.c	
@@ -118,8 +118,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - 32e8d4676bf4705cdb24ee5bdce59cf0439db900e00cbe465c2cf87ffb8c52cb
blob + a0fb9594eb1e360c5bb70229bf9ea3275d0f9936fa8b70cec0def8572754a3f2
--- gotsysd/libexec/gotsys-repo-create/gotsys-repo-create.c	
+++ gotsysd/libexec/gotsys-repo-create/gotsys-repo-create.c	
@@ -331,8 +331,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - 1b46134692632fd16666a0b1104622493cae71afb157632dfee12dd7c773b3bb
blob + 6e9e93efaf8b61858626496dd5d84f2ebd2f13a9b485747068a2cf98062010e0
--- gotsysd/libexec/gotsys-rmkeys/gotsys-rmkeys.c	
+++ gotsysd/libexec/gotsys-rmkeys/gotsys-rmkeys.c	
@@ -164,8 +164,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - ac9560a1bba0b2ac933707fc72ef7665500460f92d4489d342944de604a7ca09
blob + 1d4901fd286f8057718f97ea93a01fa8f79a234d039647b2a869843bbb663c2b
--- gotsysd/libexec/gotsys-useradd/gotsys-useradd.c	
+++ gotsysd/libexec/gotsys-useradd/gotsys-useradd.c	
@@ -759,8 +759,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - a17d7f231e0c27a7be46c04e66e804b408a111ef3fe38c1f6091d6f23c52a2f6
blob + fd595a0105dd8058fa7f56542a1ff53d0900b93122ffe04d9f5ba47782439ed9
--- gotsysd/libexec/gotsys-userhome/gotsys-userhome.c	
+++ gotsysd/libexec/gotsys-userhome/gotsys-userhome.c	
@@ -230,8 +230,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - 5abac1191ad879197b60a1b0d388a0946e76fbd71610bf806a472a9199e77308
blob + dfc3443350c8440bdce5719a7b5726285cbbd0aa0481a3ef673b9f8e956882da
--- gotsysd/libexec/gotsys-userkeys/gotsys-userkeys.c	
+++ gotsysd/libexec/gotsys-userkeys/gotsys-userkeys.c	
@@ -163,8 +163,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - 29f186d581971e23760620cfdabe086bd28686305d35123fa5f3ab57b31173bf
blob + 579422dc90d65b39f7bba6f334452062eebe3a3ea376e2f8941536ec092eec7d
--- gotsysd/libexec/gotsys-write-conf/gotsys-write-conf.c	
+++ gotsysd/libexec/gotsys-write-conf/gotsys-write-conf.c	
@@ -1741,8 +1741,8 @@ dispatch_event(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1) {
-			warn("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1) {
+			warn("%s: imsgbuf_get", __func__);
 			goto fatal;
 		}
 		if (n == 0)	/* No more messages. */
blob - 0c046b766c2e27dad775b2f92e7b4b8ecfa683d2e9b042ceec42351996482234
blob + 8101e1c026e4e15df31eeacb5757ee1fadf8e764f4b1d7a881eb24f0b5278a0f
--- gotsysd/listen.c	
+++ gotsysd/listen.c	
@@ -411,8 +411,8 @@ listen_dispatch(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - e0a0bea14a5f3add8e583865493d3c4d349fd0158d9dc1c8414090570f0575cb
blob + b4521fbb075ae4947c20623684947cc5e48bffd1f9a3b0d1a7d23a4dc6114718
--- gotsysd/sysconf.c	
+++ gotsysd/sysconf.c	
@@ -184,8 +184,8 @@ sysconf_dispatch_libexec(int fd, short event, void *ar
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1442,8 +1442,8 @@ sysconf_dispatch_priv(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1827,8 +1827,8 @@ sysconf_dispatch(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("%s: imsg_get", __func__);
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get", __func__);
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - bb7bbbe817d3ae8ea5ceb5efad1fae5840b98d6c7c71c85e48da9b71aa504f69
blob + d05570722caf8965ed581eaa7da668e448ded076a5e3f8634a37905d54d3d245
--- gotwebctl/gotwebctl.c	
+++ gotwebctl/gotwebctl.c	
@@ -162,9 +162,9 @@ cmd_info(int argc, char *argv[], int gotwebd_sock)
 		if (n == 0)
 			break;
 
-		n = imsg_get(&ibuf, &imsg);
+		n = imsgbuf_get(&ibuf, &imsg);
 		if (n == -1) {
-			err = got_error_from_errno("imsg_get");
+			err = got_error_from_errno("imsgbuf_get");
 			break;
 		}
 
@@ -236,9 +236,9 @@ cmd_stop(int argc, char *argv[], int gotwebd_sock)
 			break;
 		}
 
-		n = imsg_get(&ibuf, &imsg);
+		n = imsgbuf_get(&ibuf, &imsg);
 		if (n == -1) {
-			err = got_error_from_errno("imsg_get");
+			err = got_error_from_errno("imsgbuf_get");
 			break;
 		}
 
blob - 168b2171ffb0ca52fa31c0a3c3242dbd78195e03bab389605a559fee2514a607
blob + 0af20dc9df4f520bbbc9afddaa9f3c5364ec7038cb6e1cb4588f473274285df0
--- gotwebd/auth.c	
+++ gotwebd/auth.c	
@@ -831,8 +831,8 @@ auth_dispatch_sockets(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -935,8 +935,8 @@ auth_dispatch_gotweb(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -1026,8 +1026,8 @@ auth_dispatch_main(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - db148c7b30005ad5bf5029a384b4dea3c6b5a3299b10f0c0c7043961dda72c82
blob + fca7c914d8280ac9c1ccd88b9d9c847464ea8d87f721423424d65501db503da5
--- gotwebd/fcgi.c	
+++ gotwebd/fcgi.c	
@@ -815,8 +815,8 @@ fcgi_dispatch_server(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -904,8 +904,8 @@ fcgi_dispatch_main(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - b3b12569c4db39c9748e1b8251726cb96d710b9a852b7ec1ad12a228eefb93b2
blob + 26c383337157a6c4ff04d3e62df93ec75bc1e00afbce7a9f8d6f6bfd0854d1f8
--- gotwebd/gotweb.c	
+++ gotwebd/gotweb.c	
@@ -2022,8 +2022,8 @@ gotweb_dispatch_server(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -2117,8 +2117,8 @@ gotweb_dispatch_main(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - c4475a9a81bab3c7576988b69102eb17c1977bfa5b0a6b0740f5e3568edfb481
blob + 9f7feef64f47badc5cc599a6a54e2b272da60b47a01b81cb470806d2373ee364
--- gotwebd/gotwebd.c	
+++ gotwebd/gotwebd.c	
@@ -206,8 +206,8 @@ gotwebd_dispatch_login(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -253,8 +253,8 @@ gotwebd_dispatch_server(int fd, short event, void *arg
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -303,8 +303,8 @@ gotwebd_dispatch_fcgi(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -353,8 +353,8 @@ gotwebd_dispatch_auth(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -403,8 +403,8 @@ gotwebd_dispatch_gotweb(int fd, short event, void *arg
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -739,7 +739,7 @@ control_request(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		n = imsg_get(&client->iev.ibuf, &imsg);
+		n = imsgbuf_get(&client->iev.ibuf, &imsg);
 		if (n == -1) {
 			disconnect(client);
 			return;
blob - f63b8a470f80841dc4ccd0d4a479576322674707819719423be305aa188abf71
blob + 600acd78aa659c4292161fc432647ad229ca2fd675981debeb71123c6389b9ce
--- gotwebd/login.c	
+++ gotwebd/login.c	
@@ -781,8 +781,8 @@ login_dispatch_main(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - ba090fea1fcd6b705ecaf44f184ae949f456ca296f6018547797cf6fd4e89068
blob + 851860c6f3199afdbe31cf43e526e43c2b345eddaf8786ab70566c5e867de9bd
--- gotwebd/sockets.c	
+++ gotwebd/sockets.c	
@@ -427,8 +427,8 @@ server_dispatch_auth(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -703,8 +703,8 @@ server_dispatch_fcgi(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
@@ -814,8 +814,8 @@ sockets_dispatch_main(int fd, short event, void *arg)
 	}
 
 	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			fatal("imsg_get");
+		if ((n = imsgbuf_get(ibuf, &imsg)) == -1)
+			fatal("imsgbuf_get");
 		if (n == 0)	/* No more messages. */
 			break;
 
blob - 92322823dbfcd960429deb4f478958c897ef0360749e3cb9299310d303823db5
blob + ad5394b2180fd01df9fc1f14980ee840974981bc4533be4d3af6203c88fcb93a
--- lib/privsep.c	
+++ lib/privsep.c	
@@ -126,17 +126,17 @@ got_privsep_recv_imsg(struct imsg *imsg, struct imsgbu
 	const struct got_error *err;
 	ssize_t n;
 
-	n = imsg_get(ibuf, imsg);
+	n = imsgbuf_get(ibuf, imsg);
 	if (n == -1)
-		return got_error_from_errno("imsg_get");
+		return got_error_from_errno("imsgbuf_get");
 
 	while (n == 0) {
 		err = read_imsg(ibuf);
 		if (err)
 			return err;
-		n = imsg_get(ibuf, imsg);
+		n = imsgbuf_get(ibuf, imsg);
 		if (n == -1)
-			return got_error_from_errno("imsg_get");
+			return got_error_from_errno("imsgbuf_get");
 	}
 
 	if (imsg->hdr.type == GOT_IMSG_ERROR) {