X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Futils.c;h=4b93b042adccff13525e53e59019dd12621190fd;hp=79e3208086c733f1ea66a9eef8a5b61b4c4604f1;hb=a5f899a9794f215e8174455ead04862a2c14a5b1;hpb=eaf1208e9d5c5a15e4b23de936830520bf3b5685

diff --git a/lib/utils.c b/lib/utils.c
index 79e32080..4b93b042 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1,7 +1,7 @@
 /*
     utils.c -- gathering of some stupid small functions
-    Copyright (C) 1999-2001 Ivo Timmermans <zarq@iname.com>
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans <zarq@iname.com>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -18,15 +18,10 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "config.h"
+#include "system.h"
 
-#include <sys/types.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <utils.h>
-#include <syslog.h>
-#include <xalloc.h>
+#include "../src/logger.h"
+#include "utils.h"
 
 #ifdef ENABLE_TRACING
 volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -64,7 +59,7 @@ void bin2hex(char *src, char *dst, int length)
 #ifdef ENABLE_TRACING
 void cp_trace()
 {
-	syslog(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
+	logger(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
 		   cp_file[(cp_index + 15) % 16], cp_line[(cp_index + 15) % 16],
 		   cp_file[(cp_index + 14) % 16], cp_line[(cp_index + 14) % 16],
 		   cp_file[(cp_index + 13) % 16], cp_line[(cp_index + 13) % 16],
@@ -84,3 +79,24 @@ void cp_trace()
 		);
 }
 #endif
+
+#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
+#ifdef HAVE_CYGWIN
+#include <w32api/windows.h>
+#endif
+
+char *winerror(int err) {
+	static char buf[1024], *newline;
+
+	if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+	        NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, sizeof(buf), NULL)) {
+		strncpy(buf, _("(unable to format errormessage)"), sizeof(buf));
+	};
+
+	if((newline = strchr(buf, '\r')))
+		*newline = '\0';
+
+	return buf;
+}
+#endif
+