Merge branch 'obsd-master'

Conflicts:
	Makefile
	format.c
This commit is contained in:
Thomas Adam
2015-08-30 21:44:01 +01:00
26 changed files with 594 additions and 388 deletions

9
log.c
View File

@ -67,14 +67,15 @@ log_close(void)
void
log_vwrite(const char *msg, va_list ap)
{
char *fmt;
time_t t;
char *fmt;
struct timeval tv;
if (log_file == NULL)
return;
t = time(NULL);
if (asprintf(&fmt, "%lld %s\n", (long long)t, msg) == -1)
gettimeofday(&tv, NULL);
if (asprintf(&fmt, "%lld.%06d %s\n", (long long)tv.tv_sec,
(int)tv.tv_usec, msg) == -1)
exit(1);
if (vfprintf(log_file, fmt, ap) == -1)
exit(1);