Check for sys/uio.h, net/if_tun.h and net/if_tap.h

[tinc] / lib / utils.c

diff --git a/lib/utils.c b/lib/utils.c
index 6b3dd23..19c86a9 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1,7 +1,7 @@
 /*
     utils.c -- gathering of some stupid small functions
-    Copyright (C) 1999-2003 Ivo Timmermans <zarq@iname.com>
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2004 Ivo Timmermans <zarq@iname.com>
+                  2000-2004 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
@@ -80,15 +80,22 @@ void cp_trace()
 }
 #endif
 
-#ifdef HAVE_MINGW
+#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
+#ifdef HAVE_CYGWIN
+#include <w32api/windows.h>
+#endif
+
 char *winerror(int err) {
-       static char buf[1024];
+       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