Put script environment creation/deletion in functions.

[tinc] / src / logger.c

diff --git a/src/logger.c b/src/logger.c
index e46d926..4075ea8 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2015 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2017 Guus Sliepen <guus@tinc-vpn.org>
                   2004-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include "process.h"
 #include "sptps.h"
 
-debug_t debug_level = DEBUG_NOTHING;
+int debug_level = DEBUG_NOTHING;
 static logmode_t logmode = LOGMODE_STDERR;
 static pid_t logpid;
 static FILE *logfile = NULL;
@@ -110,20 +110,22 @@ void logger(int level, int priority, const char *format, ...) {
 
        va_start(ap, format);
        int len = vsnprintf(message, sizeof message, format, ap);
+       message[sizeof message - 1] = 0;
        va_end(ap);
 
-       if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+       if(len > 0 && len < sizeof message - 1 && message[len - 1] == '\n')
                message[len - 1] = 0;
 
        real_logger(level, priority, message);
 }
 
 static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
-       char message[1024] = "";
+       char message[1024];
        size_t msglen = sizeof message;
 
        int len = vsnprintf(message, msglen, format, ap);
-       if(len > 0 && len < sizeof message) {
+       message[sizeof message - 1] = 0;
+       if(len > 0 && len < sizeof message - 1) {
                if(message[len - 1] == '\n')
                        message[--len] = 0;