[PATCH ucspi-vsock] vsockserver: consistently use diee instead of err
diee is our function that respects the verbosity setting. --- vsockserver.c | 13 ++++++------- 1 file 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"); } -- 2.30.0
participants (2)
-
Alyssa Ross -
Cole Helbling