From: nicm <nicm@openbsd.org>
Date: Thu, 18 Jan 2018 14:28:11 +0000 (+0000)
Subject: Discard all but the last line when reading from a #() command - the
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=aef8f1e7ca4327f9370dcf43d8fe7f2bdeb6edf0;p=openbsd

Discard all but the last line when reading from a #() command - the
callback is just going to be fired again straight away to go through all
the lines, it is better just to use the last one straight away.
---

diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c
index 9b310e9ee9e..c2b7f215fcc 100644
--- a/usr.bin/tmux/format.c
+++ b/usr.bin/tmux/format.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.150 2017/11/02 18:52:05 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.151 2018/01/18 14:28:11 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -191,10 +191,15 @@ static void
 format_job_update(struct job *job)
 {
 	struct format_job	*fj = job->data;
-	char			*line;
+	struct evbuffer		*evb = job->event->input;
+	char			*line = NULL, *next;
 	time_t			 t;
 
-	if ((line = evbuffer_readline(job->event->input)) == NULL)
+	while ((next = evbuffer_readline(evb)) != NULL) {
+		free(line);
+		line = next;
+	}
+	if (line == NULL)
 		return;
 	fj->updated = 1;