Force nul-termination of strings after vsnprintf().

[oweals/tinc.git] / src / logger.c

diff --git a/src/logger.c b/src/logger.c
index 8029565ff43da5260a51eb219692148ac51fecb8..e0e6bcad4714350bbcff38b3d45ae7631e386f52 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,7 +1,7 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2003 Guus Sliepen <guus@sliepen.eu.org>
-                  2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2004-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -13,31 +13,27 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: logger.c,v 1.1.2.2 2003/07/06 23:16:28 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
-#include <unistd.h>
+#include "system.h"
 
 #include "conf.h"
 #include "logger.h"
 
-#include "system.h"
-
-volatile int debug_level = DEBUG_NOTHING;
-static int logmode = LOGMODE_STDERR;
+debug_t debug_level = DEBUG_NOTHING;
+static logmode_t logmode = LOGMODE_STDERR;
 static pid_t logpid;
 extern char *logfilename;
 static FILE *logfile = NULL;
+#ifdef HAVE_MINGW
+static HANDLE loghandle = NULL;
+#endif
 static const char *logident = NULL;
 
-void openlogger(const char *ident, int mode) {
+void openlogger(const char *ident, logmode_t mode) {
        logident = ident;
        logmode = mode;
        
@@ -48,27 +44,76 @@ void openlogger(const char *ident, int mode) {
                case LOGMODE_FILE:
                        logpid = getpid();
                        logfile = fopen(logfilename, "a");
-                       if(!logfile)
+                       if(!logfile) {
+                               fprintf(stderr, "Could not open log file %s: %s\n", logfilename, strerror(errno));
                                logmode = LOGMODE_NULL;
+                       }
                        break;
                case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+                       loghandle = RegisterEventSource(NULL, logident);
+                       if(!loghandle) {
+                               fprintf(stderr, "Could not open log handle!");
+                               logmode = LOGMODE_NULL;
+                       }
+                       break;
+#else
+#ifdef HAVE_SYSLOG_H
                        openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
                        break;
+#endif
+#endif
+               case LOGMODE_NULL:
+                       break;
        }
 }
 
-void vlogger(int priority, const char *format, va_list ap) {
+void reopenlogger() {
+       if(logmode != LOGMODE_FILE)
+               return;
+
+       fflush(logfile);
+       FILE *newfile = fopen(logfilename, "a");
+       if(!newfile) {
+               logger(LOG_ERR, "Unable to reopen log file %s: %s", logfilename, strerror(errno));
+               return;
+       }
+       fclose(logfile);
+       logfile = newfile;
+}
+
+void logger(int priority, const char *format, ...) {
+       va_list ap;
+       char timestr[32] = "";
+       time_t now;
+
+       va_start(ap, format);
+
        switch(logmode) {
                case LOGMODE_STDERR:
                        vfprintf(stderr, format, ap);
                        fprintf(stderr, "\n");
+                       fflush(stderr);
                        break;
                case LOGMODE_FILE:
-                       fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
+                       now = time(NULL);
+                       strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now));
+                       fprintf(logfile, "%s %s[%ld]: ", timestr, logident, (long)logpid);
                        vfprintf(logfile, format, ap);
                        fprintf(logfile, "\n");
+                       fflush(logfile);
                        break;
                case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+                       {
+                               char message[4096];
+                               const char *messages[] = {message};
+                               vsnprintf(message, sizeof(message), format, ap);
+                               message[sizeof message - 1] = 0;
+                               ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
+                       }
+#else
+#ifdef HAVE_SYSLOG_H
 #ifdef HAVE_VSYSLOG
                        vsyslog(priority, format, ap);
 #else
@@ -79,7 +124,13 @@ void vlogger(int priority, const char *format, va_list ap) {
                        }
 #endif
                        break;
+#endif
+#endif
+               case LOGMODE_NULL:
+                       break;
        }
+
+       va_end(ap);
 }
 
 void closelogger(void) {
@@ -88,7 +139,18 @@ void closelogger(void) {
                        fclose(logfile);
                        break;
                case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+                       DeregisterEventSource(loghandle);
+                       break;
+#else
+#ifdef HAVE_SYSLOG_H
                        closelog();
                        break;
+#endif
+#endif
+               case LOGMODE_NULL:
+               case LOGMODE_STDERR:
+                       break;
+                       break;
        }
 }