From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH ucspi-vsock] vsockserver: consistently use diee instead of err
Date: Thu, 18 Mar 2021 00:12:56 +0000 [thread overview]
Message-ID: <20210318001256.4078-1-hi@alyssa.is> (raw)
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
next reply other threads:[~2021-03-18 0:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 0:12 Alyssa Ross [this message]
2021-03-18 0:19 ` Cole Helbling
2021-03-18 0:44 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210318001256.4078-1-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).