mingw: implement syslog
Syslog does not usually exist on Windows, so implement our own using Window's ReportEvent mechanism. Strings containing "%1" gets expanded into them selves by ReportEvent, resulting in an unreadable string. "%2" and above is not a problem. Unfortunately, on Windows an IPv6 address can contain "%1", so expand "%1" to "% 1" before reporting. "%%1" is also a problem for ReportEvent, but that string cannot occur in an IPv6 address. Signed-off-by: Mike Pape <dotzenlabs@gmail.com> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mike Pape committed
Nov 4, 2010 at 02:35 UTC
088d880247dc7bb1a27f07e320bab7f9b63e06bc
5 files changed
+96
-4
Makefile
+3
-2
@@ -496,6 +496,7 @@ LIB_H += compat/bswap.h
496
LIB_H += compat/cygwin.h
497
LIB_H += compat/mingw.h
498
LIB_H += compat/win32/pthread.h
499
+LIB_H += compat/win32/syslog.h
500
LIB_H += csum-file.h
501
LIB_H += decorate.h
502
LIB_H += delta.h
@@ -1081,7 +1082,7 @@ ifeq ($(uname_S),Windows)
1082
AR = compat/vcbuild/scripts/lib.pl
1083
CFLAGS =
1084
BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
1084
- COMPAT_OBJS = compat/msvc.o compat/fnmatch/fnmatch.o compat/winansi.o compat/win32/pthread.o
1085
+ COMPAT_OBJS = compat/msvc.o compat/fnmatch/fnmatch.o compat/winansi.o compat/win32/pthread.o compat/win32/syslog.o
1086
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
1087
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
1088
EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
@@ -1131,7 +1132,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
1132
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch -Icompat/win32
1133
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
1134
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o \
1134
- compat/win32/pthread.o
1135
+ compat/win32/pthread.o compat/win32/syslog.o
1136
EXTLIBS += -lws2_32
1137
PTHREAD_LIBS =
1138
X = .exe
compat/win32/syslog.c
new
+72
@@ -0,0 +1,72 @@
1
+#include "../../git-compat-util.h"
2
+#include "../../strbuf.h"
3
+
4
+static HANDLE ms_eventlog;
5
+
6
+void openlog(const char *ident, int logopt, int facility)
7
+{
8
+ if (ms_eventlog)
9
+ return;
10
+
11
+ ms_eventlog = RegisterEventSourceA(NULL, ident);
12
+
13
+ if (!ms_eventlog)
14
+ warning("RegisterEventSource() failed: %lu", GetLastError());
15
+}
16
+
17
+void syslog(int priority, const char *fmt, ...)
18
+{
19
+ struct strbuf sb = STRBUF_INIT;
20
+ struct strbuf_expand_dict_entry dict[] = {
21
+ {"1", "% 1"},
22
+ {NULL, NULL}
23
+ };
24
+ WORD logtype;
25
+ char *str;
26
+ int str_len;
27
+ va_list ap;
28
+
29
+ if (!ms_eventlog)
30
+ return;
31
+
32
+ va_start(ap, fmt);
33
+ str_len = vsnprintf(NULL, 0, fmt, ap);
34
+ va_end(ap);
35
+
36
+ if (str_len < 0) {
37
+ warning("vsnprintf failed: '%s'", strerror(errno));
38
+ return;
39
+ }
40
+
41
+ str = malloc(str_len + 1);
42
+ va_start(ap, fmt);
43
+ vsnprintf(str, str_len + 1, fmt, ap);
44
+ va_end(ap);
45
+ strbuf_expand(&sb, str, strbuf_expand_dict_cb, &dict);
46
+ free(str);
47
+
48
+ switch (priority) {
49
+ case LOG_EMERG:
50
+ case LOG_ALERT:
51
+ case LOG_CRIT:
52
+ case LOG_ERR:
53
+ logtype = EVENTLOG_ERROR_TYPE;
54
+ break;
55
+
56
+ case LOG_WARNING:
57
+ logtype = EVENTLOG_WARNING_TYPE;
58
+ break;
59
+
60
+ case LOG_NOTICE:
61
+ case LOG_INFO:
62
+ case LOG_DEBUG:
63
+ default:
64
+ logtype = EVENTLOG_INFORMATION_TYPE;
65
+ break;
66
+ }
67
+
68
+ ReportEventA(ms_eventlog, logtype, 0, 0, NULL, 1, 0,
69
+ (const char **)&sb.buf, NULL);
70
+
71
+ strbuf_release(&sb);
72
+}
compat/win32/syslog.h
new
+20
@@ -0,0 +1,20 @@
1
+#ifndef SYSLOG_H
2
+#define SYSLOG_H
3
+
4
+#define LOG_PID 0x01
5
+
6
+#define LOG_EMERG 0
7
+#define LOG_ALERT 1
8
+#define LOG_CRIT 2
9
+#define LOG_ERR 3
10
+#define LOG_WARNING 4
11
+#define LOG_NOTICE 5
12
+#define LOG_INFO 6
13
+#define LOG_DEBUG 7
14
+
15
+#define LOG_DAEMON (3<<3)
16
+
17
+void openlog(const char *ident, int logopt, int facility);
18
+void syslog(int priority, const char *fmt, ...);
19
+
20
+#endif /* SYSLOG_H */
daemon.c
-2
@@ -5,8 +5,6 @@
5
#include "strbuf.h"
6
#include "string-list.h"
7
8
-#include <syslog.h>
9
-
8
#ifndef HOST_NAME_MAX
9
#define HOST_NAME_MAX 256
10
#endif
git-compat-util.h
+1
@@ -104,6 +104,7 @@
104
#include <assert.h>
105
#include <regex.h>
106
#include <utime.h>
107
+#include <syslog.h>
108
#ifndef __MINGW32__
109
#include <sys/wait.h>
110
#include <sys/poll.h>