PIDs are of type pid_t, and use %ld when reading/writing them to the pidfile.

[tinc] / src / logger.c

diff --git a/src/logger.c b/src/logger.c
index b8ea092..dec88fd 100644 (file)
--- 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.4 2003/07/17 15:06:26 guus Exp $
+    $Id: logger.c,v 1.1.2.12 2003/10/06 16:13:07 guus Exp $
 */
 
 #include "system.h"
@@ -25,14 +25,17 @@
 #include "conf.h"
 #include "logger.h"
 
-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;
        
@@ -47,8 +50,19 @@ void openlogger(const char *ident, int mode) {
                                logmode = LOGMODE_NULL;
                        break;
                case LOGMODE_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;
        }
 }
 
@@ -61,13 +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);
+                       fprintf(logfile, "%ld %s[%ld]: ", time(NULL), logident, (long)logpid);
                        vfprintf(logfile, format, ap);
                        fprintf(logfile, "\n");
+                       fflush(logfile);
                        break;
                case LOGMODE_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
@@ -78,6 +103,10 @@ void logger(int priority, const char *format, ...) {
                        }
 #endif
                        break;
+#endif
+#endif
+               case LOGMODE_NULL:
+                       break;
        }
 
        va_end(ap);
@@ -89,7 +118,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;
        }
 }