undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mingw: avoid using strbuf in syslog

Browse Source 
strbuf can call die, which again can call syslog from git-daemon.

Endless recursion is no fun; fix it by hand-rolling the logic. As
a side-effect malloc/realloc errors are changed into non-fatal
warnings; this is probably an improvement anyway.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Noticed-by: Johannes Sixt <j.sixt@viscovery.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Erik Faye-Lund 2011-10-06 19:52:48 +02:00 committed by Junio C Hamano
parent 703f05ad58
commit 2a6b149c64
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compat/win32/syslog.c
View File

@ -1,5 +1,4 @@
#include "../../git-compat-util.h"
#include "../../strbuf.h"
static HANDLE ms_eventlog;
@ -16,13 +15,8 @@ void openlog(const char *ident, int logopt, int facility)
void syslog(int priority, const char *fmt, ...)
{
struct strbuf sb = STRBUF_INIT;
struct strbuf_expand_dict_entry dict[] = {
{"1", "% 1"},
{NULL, NULL}
};
WORD logtype;
char *str;
char *str, *pos;
int str_len;
va_list ap;
@ -39,11 +33,24 @@ void syslog(int priority, const char *fmt, ...)
}
str = malloc(str_len + 1);
if (!str) {
warning("malloc failed: '%s'", strerror(errno));
return;
}
va_start(ap, fmt);
vsnprintf(str, str_len + 1, fmt, ap);
va_end(ap);
strbuf_expand(&sb, str, strbuf_expand_dict_cb, &dict);
free(str);
while ((pos = strstr(str, "%1")) != NULL) {
str = realloc(str, ++str_len + 1);
if (!str) {
warning("realloc failed: '%s'", strerror(errno));
return;
}
memmove(pos + 2, pos + 1, strlen(pos));
pos[1] = ' ';
}
switch (priority) {
case LOG_EMERG:
@ -66,7 +73,6 @@ void syslog(int priority, const char *fmt, ...)
}
ReportEventA(ms_eventlog, logtype, 0, 0, NULL, 1, 0,
(const char **)&sb.buf, NULL);
strbuf_release(&sb);
(const char **)&str, NULL);
free(str);
}