From: Timo Sirainen <tss@iki.fi>
Date: Mon, 7 Sep 2009 15:57:38 +0000 (-0400)
Subject: master: Fixes to logging startup errors.
X-Git-Tag: 2.0.alpha1~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db69c7976fdad05bd5dd2fb5515cc5167bebf896;p=thirdparty%2Fdovecot%2Fcore.git

master: Fixes to logging startup errors.

--HG--
branch : HEAD
---

diff --git a/src/master/main.c b/src/master/main.c
index 18271aef58..75ffe469f2 100644
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -152,10 +152,10 @@ static void ATTR_NORETURN
 startup_fatal_handler(enum log_type type, int status,
 		      const char *fmt, va_list args)
 {
-	fputs("Fatal: ", stderr);
-	vfprintf(stderr, fmt, args);
-	fputc('\n', stderr);
+	va_list args2;
 
+	VA_COPY(args2, args);
+	fprintf(stderr, "Fatal: %s\n", t_strdup_vprintf(fmt, args2));
 	orig_fatal_callback(type, status, fmt, args);
 	abort();
 }
@@ -163,10 +163,10 @@ startup_fatal_handler(enum log_type type, int status,
 static void
 startup_error_handler(enum log_type type, const char *fmt, va_list args)
 {
-	fputs("Error: ", stderr);
-	vfprintf(stderr, fmt, args);
-	fputc('\n', stderr);
+	va_list args2;
 
+	VA_COPY(args2, args);
+	fprintf(stderr, "Error: %s\n", t_strdup_vprintf(fmt, args2));
 	orig_error_callback(type, fmt, args);
 }