X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flogger.c;h=02f3f0f8c14aac3ff35dd441babf9f3ea543efed;hp=1f7785f2205d686be22a22a0c5c5ce6e5962ea5f;hb=46cfe6199449a86eb58abaeac45b4021ffa7e178;hpb=0e945413315c9d15a3eb013fa3731dd978a8c7b8

diff --git a/src/logger.c b/src/logger.c
index 1f7785f2..02f3f0f8 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -17,7 +17,7 @@
     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.6 2003/07/28 22:06:09 guus Exp $
+    $Id: logger.c,v 1.1.2.11 2003/08/17 12:04:35 guus Exp $
 */
 
 #include "system.h"
@@ -30,6 +30,9 @@ 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, logmode_t mode) {
@@ -47,9 +50,16 @@ void openlogger(const char *ident, logmode_t mode) {
 				logmode = LOGMODE_NULL;
 			break;
 		case LOGMODE_SYSLOG:
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_MINGW
+			loghandle = RegisterEventSource(NULL, logident);
+			if(!loghandle)
+				logmode = LOGMODE_NULL;
+			break;
+#else
+#ifdef HAVE_SYSLOG_H
 			openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
 			break;
+#endif
 #endif
 		case LOGMODE_NULL:
 			break;
@@ -65,14 +75,24 @@ void logger(int priority, const char *format, ...) {
 		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);
 			vfprintf(logfile, format, ap);
 			fprintf(logfile, "\n");
+			fflush(logfile);
 			break;
 		case LOGMODE_SYSLOG:
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_MINGW
+			{
+				char message[4096];
+				char *messages[] = {message};
+				vsnprintf(message, sizeof(message), format, ap);
+				ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
+			}
+#else
+#ifdef HAVE_SYSLOG_H
 #ifdef HAVE_VSYSLOG
 			vsyslog(priority, format, ap);
 #else
@@ -83,6 +103,7 @@ void logger(int priority, const char *format, ...) {
 			}
 #endif
 			break;
+#endif
 #endif
 		case LOGMODE_NULL:
 			break;
@@ -97,9 +118,14 @@ void closelogger(void) {
 			fclose(logfile);
 			break;
 		case LOGMODE_SYSLOG:
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_MINGW
+			DeregisterEventSource(loghandle);
+			break;
+#else
+#ifdef HAVE_SYSLOG_H
 			closelog();
 			break;
+#endif
 #endif
 		case LOGMODE_NULL:
 		case LOGMODE_STDERR: