From 5bb00bddc726ec1718ac67ae6283f7d5ac81f84a Mon Sep 17 00:00:00 2001
Message-Id: <5bb00bddc726ec1718ac67ae6283f7d5ac81f84a.1714952241.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 17 Oct 2009 13:37:16 +0100
Subject: [PATCH] If including both program name and date in log message, put
 date first.
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 lib/log.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/log.c b/lib/log.c
index 95a89a1..00ec7cd 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -123,8 +123,6 @@ static void logfp(int pri, const char *msg, void *user) {
    * sanely */
   const char *p;
   
-  if(progname)
-    fprintf(fp, "%s: ", progname);
   if(logdate) {
     char timebuf[64];
     struct tm *tm;
@@ -132,7 +130,9 @@ static void logfp(int pri, const char *msg, void *user) {
     tm = localtime(&tv.tv_sec);
     strftime(timebuf, sizeof timebuf, "%Y-%m-%d %H:%M:%S %Z", tm);
     fprintf(fp, "%s: ", timebuf);
-  }
+  } 
+ if(progname)
+    fprintf(fp, "%s: ", progname);
   if(pri <= LOG_ERR)
     fputs("ERROR: ", fp);
   else if(pri < LOG_DEBUG)
-- 
[mdw]