From: Roy Marples <roy@marples.name>
Date: Sat, 22 Feb 2020 16:42:31 +0000 (+0000)
Subject: dhcpcd: don't report forked to background in quiet mode
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2720cb9a935f1faeff08c9081701cbc78d8e230d;p=thirdparty%2Fdhcpcd.git

dhcpcd: don't report forked to background in quiet mode
---

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index e7353d57..d8c102bb 100644
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -347,7 +347,9 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx)
 		return;
 
 	/* Don't use loginfo because this makes no sense in a log. */
-	fprintf(stderr, "forked to background, child pid %d\n", getpid());
+	if (!(loggetopts() & LOGERR_QUIET))
+		fprintf(stderr, "forked to background, child pid %d\n",
+		    getpid());
 	i = EXIT_SUCCESS;
 	if (write(ctx->fork_fd, &i, sizeof(i)) == -1)
 		logerr("write");
diff --git a/src/logerr.c b/src/logerr.c
index 09ddceec..170b529d 100644
--- a/src/logerr.c
+++ b/src/logerr.c
@@ -330,6 +330,14 @@ log_errx(const char *fmt, ...)
 	va_end(args);
 }
 
+unsigned int
+loggetopts(void)
+{
+	struct logctx *ctx = &_logctx;
+
+	return ctx->log_opts;
+}
+
 void
 logsetopts(unsigned int opts)
 {
diff --git a/src/logerr.h b/src/logerr.h
index 712f25b1..4b4d6dc4 100644
--- a/src/logerr.h
+++ b/src/logerr.h
@@ -76,6 +76,7 @@ __printflike(2, 3) void logerrmessage(int pri, const char *fmt, ...);
 #define logerr(...)	log_err(__VA_ARGS__)
 #define logerrx(...)	log_errx(__VA_ARGS__)
 
+unsigned int loggetopts(void);
 void logsetopts(unsigned int);
 #define	LOGERR_DEBUG	(1U << 6)
 #define	LOGERR_QUIET	(1U << 7)