Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-08-28 14:01:11 +01:00
16 changed files with 118 additions and 129 deletions

4
log.c
View File

@ -68,11 +68,13 @@ void
log_vwrite(const char *msg, va_list ap)
{
char *fmt;
time_t t;
if (log_file == NULL)
return;
if (asprintf(&fmt, "%s\n", msg) == -1)
t = time(NULL);
if (asprintf(&fmt, "%lld %s\n", (long long)t, msg) == -1)
exit(1);
if (vfprintf(log_file, fmt, ap) == -1)
exit(1);