Merge branch 'obsd-master'

Conflicts:
	Makefile
	format.c

1 files changed, 5 insertions, 4 deletions

diff --git a/log.c b/log.c
index 9afeb2ae..2fe12a17 100644
--- a/log.c
+++ b/log.c
@@ -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);