From c19877218eae18fa21b86d7d0acb08780de5eb04 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 3 May 2015 14:02:02 +0200
Subject: [PATCH 308/325] ggatec: Add log-to-file support

Obtained from: ElectroBSD
---
 sbin/ggate/ggatec/ggatec.c |  5 ++++-
 sbin/ggate/shared/ggate.c  | 26 +++++++++++++++++++++-----
 sbin/ggate/shared/ggate.h  |  1 +
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index b60fb35d5ff5..6af026e80277 100644
--- a/sbin/ggate/ggatec/ggatec.c
+++ b/sbin/ggate/ggatec/ggatec.c
@@ -632,7 +632,7 @@ main(int argc, char *argv[])
 		int ch;
 		char *p;
 
-		ch = getopt(argc, argv, "fno:p:q:R:S:s:t:T:u:v");
+		ch = getopt(argc, argv, "fl:no:p:q:R:S:s:t:T:u:v");
 		if (ch == -1)
 			break;
 		switch (ch) {
@@ -641,6 +641,9 @@ main(int argc, char *argv[])
 				usage();
 			force = 1;
 			break;
+		case 'l':
+			g_gate_open_log(optarg);
+			break;
 		case 'n':
 			if (action != CREATE && action != RESCUE)
 				usage();
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index d6be4948d9c6..084db7304e53 100644
--- a/sbin/ggate/shared/ggate.c
+++ b/sbin/ggate/shared/ggate.c
@@ -28,6 +28,7 @@
  * $FreeBSD$
  */
 
+#define _WITH_DPRINTF
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -61,13 +62,23 @@
 
 int g_gate_devfd = -1;
 int g_gate_verbose = 0;
+static int g_gate_logfd = -1;
 
+void
+g_gate_open_log(const char *logfile)
+{
+
+	g_gate_logfd = open(logfile, O_CREAT | O_WRONLY | O_APPEND, S_IWUSR |S_IRUSR);
+	if (g_gate_logfd == -1) {
+		g_gate_xlog("Failed to open %s: %s", logfile, strerror(errno));
+	}
+}
 
 void
 g_gate_vlog(int priority, const char *message, va_list ap)
 {
 
-	if (g_gate_verbose) {
+	if (g_gate_verbose || g_gate_logfd != -1) {
 		const char *prefix;
 
 		switch (priority) {
@@ -89,10 +100,15 @@ g_gate_vlog(int priority, const char *message, va_list ap)
 		default:
 			prefix = "unknown";
 		}
-
-		printf("%s: ", prefix);
-		vprintf(message, ap);
-		printf("\n");
+		if (g_gate_logfd == -1) {
+			printf("%s: ", prefix);
+			vprintf(message, ap);
+			printf("\n");
+		} else if (g_gate_verbose || priority != LOG_DEBUG) {
+			dprintf(g_gate_logfd, "%s: ", prefix);
+			vdprintf(g_gate_logfd, message, ap);
+			dprintf(g_gate_logfd, "\n");
+		}
 	} else {
 		if (priority != LOG_DEBUG)
 			vsyslog(priority, message, ap);
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index cc67ca49571f..422a60e0b7d5 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -97,6 +97,7 @@ struct g_gate_hdr {
 	uint16_t	gh_error;	/* error value (0 if ok) */
 } __packed;
 
+void    g_gate_open_log(const char *logfile);
 void	g_gate_vlog(int priority, const char *message, va_list ap);
 void	g_gate_log(int priority, const char *message, ...);
 void	g_gate_xvlog(const char *message, va_list ap) __dead2;
-- 
2.32.0