Merge branch 'obsd-master'

Conflicts:
	tmux.1
	window.c

1 files changed, 17 insertions, 4 deletions

diff --git a/log.c b/log.c
index caf3996a..8998cf2a 100644
--- a/log.c
+++ b/log.c
@@ -61,12 +61,10 @@ log_open(const char *name)
 
 	if (log_level == 0)
 		return;
-
-	if (log_file != NULL)
-		fclose(log_file);
+	log_close();
 
 	xasprintf(&path, "tmux-%s-%ld.log", name, (long)getpid());
-	log_file = fopen(path, "w");
+	log_file = fopen(path, "a");
 	free(path);
 	if (log_file == NULL)
 		return;
@@ -75,6 +73,21 @@ log_open(const char *name)
 	event_set_log_callback(log_event_cb);
 }
 
+/* Toggle logging. */
+void
+log_toggle(const char *name)
+{
+	if (log_level == 0) {
+		log_level = 1;
+		log_open(name);
+		log_debug("log opened");
+	} else {
+		log_debug("log closed");
+		log_level = 0;
+		log_close();
+	}
+}
+
 /* Close logging. */
 void
 log_close(void)