summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-03-17 14:12:11 +0000
committerAlyssa Ross <hi@alyssa.is>2021-03-18 00:41:51 +0000
commit2a1862193f6c5d7f5e0d114d99149c5d96b9b45c (patch)
treef5921b5cf664771b4ef42aa7133c8bc980aba909
parentf77866689c7dd13632f7e61f7acb0534289e793b (diff)
downloaducspi-vsock-2a1862193f6c5d7f5e0d114d99149c5d96b9b45c.tar
ucspi-vsock-2a1862193f6c5d7f5e0d114d99149c5d96b9b45c.tar.gz
ucspi-vsock-2a1862193f6c5d7f5e0d114d99149c5d96b9b45c.tar.bz2
ucspi-vsock-2a1862193f6c5d7f5e0d114d99149c5d96b9b45c.tar.lz
ucspi-vsock-2a1862193f6c5d7f5e0d114d99149c5d96b9b45c.tar.xz
ucspi-vsock-2a1862193f6c5d7f5e0d114d99149c5d96b9b45c.tar.zst
ucspi-vsock-2a1862193f6c5d7f5e0d114d99149c5d96b9b45c.zip
vsockserver: consistently use diee instead of err
diee is our function that respects the verbosity setting.

Message-Id: <20210318001256.4078-1-hi@alyssa.is>
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
-rw-r--r--vsockserver.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/vsockserver.c b/vsockserver.c
index 0317cd4..8f809ec 100644
--- a/vsockserver.c
+++ b/vsockserver.c
@@ -3,7 +3,6 @@
 
 #define _GNU_SOURCE
 
-#include <err.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <stdbool.h>
@@ -105,22 +104,22 @@ int main(int argc, char *argv[])
 		ilog("connection from %" PRIu32 " port %" PRIu32, rcid, rport);
 
 		switch (child = fork()) {
-		case -1: err(EX_OSERR, "fork");
+		case -1: diee(EX_OSERR, "fork");
 		case 0:
 			if (dup2(conn, STDIN_FILENO) == -1)
-				err(EX_OSERR, "dup2");
+				diee(EX_OSERR, "dup2");
 			if (dup2(conn, STDOUT_FILENO) == -1)
-				err(EX_OSERR, "dup2");
+				diee(EX_OSERR, "dup2");
 			if (conn != 0 && conn != 1)
 				close(conn);
 			execvp(argv[optind], &argv[optind]);
-			err(EX_OSERR, "exec");
+			diee(EX_OSERR, "exec");
 		}
 
 		if (waitpid(child, NULL, 0) == -1)
-			err(EX_OSERR, "waitpid");
+			diee(EX_OSERR, "waitpid");
 
 		close(conn);
 	}
-	err(EX_OSERR, "accept");
+	diee(EX_OSERR, "accept");
 }