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.1 2003/07/06 22:11:31 guus Exp $
+ $Id: logger.c,v 1.1.2.12 2003/10/06 16:13:07 guus Exp $
*/
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
+#include "system.h"
#include "conf.h"
#include "logger.h"
-#include "system.h"
-
-volatile int debug_level = DEBUG_NOTHING;
-int logmode = LOGMODE_STDERR;
-pid_t logpid;
+debug_t debug_level = DEBUG_NOTHING;
+static logmode_t logmode = LOGMODE_STDERR;
+static pid_t logpid;
extern char *logfilename;
-FILE *logfile = NULL;
-const char *logident = NULL;
-
-void openlogger(const char *ident, int mode) {
- char *fname;
+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) {
logident = ident;
logmode = 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;
}
}
-void vlogger(int priority, const char *format, va_list ap) {
+void logger(int priority, const char *format, ...) {
+ va_list ap;
+
+ va_start(ap, format);
+
switch(logmode) {
case LOGMODE_STDERR:
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
+ fflush(stderr);
break;
case LOGMODE_FILE:
- fprintf(logfile, "%d %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
}
#endif
break;
+#endif
+#endif
+ case LOGMODE_NULL:
+ break;
}
+
+ va_end(ap);
}
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;
}
}