===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/log.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/tmux/log.c	2015/08/29 00:24:44	1.14
+++ src/usr.bin/tmux/log.c	2015/09/01 19:14:43	1.15
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.14 2015/08/29 00:24:44 nicm Exp $ */
+/* $OpenBSD: log.c,v 1.15 2015/09/01 19:14:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <vis.h>
 
 #include "tmux.h"
 
@@ -66,19 +67,24 @@
 void
 log_vwrite(const char *msg, va_list ap)
 {
-	char		*fmt;
+	char		*fmt, *out;
 	struct timeval	 tv;
 
 	if (log_file == NULL)
 		return;
 
-	gettimeofday(&tv, NULL);
-	if (asprintf(&fmt, "%lld.%06d %s\n", (long long)tv.tv_sec,
-	    (int)tv.tv_usec, msg) == -1)
+	if (vasprintf(&fmt, msg, ap) == -1)
 		exit(1);
-	if (vfprintf(log_file, fmt, ap) == -1)
+	if (stravis(&out, fmt, VIS_OCTAL|VIS_CSTYLE|VIS_TAB|VIS_NL) == -1)
 		exit(1);
+
+	gettimeofday(&tv, NULL);
+	if (fprintf(log_file, "%lld.%06d %s\n", (long long)tv.tv_sec,
+	    (int)tv.tv_usec, out) == -1)
+		exit(1);
 	fflush(log_file);
+
+	free(out);
 	free(fmt);
 }