From a8769ef12d7e223e33fc47bed03fba2bfa2f3536 Mon Sep 17 00:00:00 2001
From: Marcus Sundberg <marcus@marcussundberg.com>
Date: Sat, 26 Mar 2016 20:11:43 +0100
Subject: [PATCH] evbuffer_add: Use last_with_datap if set, not last.

evbuffer_add() would always put data in the last chain, even if there
was available space in a previous chain, and in doing so it also
failed to update last_with_datap, causing subsequent calls to other
functions that do look at last_with_datap to add data in the middle
of the evbuffer instead of at the end.

Fixes the evbuffer_add() part of issue #335, and the evbuffer/add2 and
evbuffer/add3 tests, and also prevents wasting space available in the
chain pointed to by last_with_datap.
---
 buffer.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/buffer.c b/buffer.c
index 7cca0e8a..f378b731 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1732,7 +1732,11 @@ evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen)
 		goto done;
 	}
 
-	chain = buf->last;
+	if (*buf->last_with_datap == NULL) {
+		chain = buf->last;
+	} else {
+		chain = *buf->last_with_datap;
+	}
 
 	/* If there are no chains allocated for this buffer, allocate one
 	 * big enough to hold all the data. */
-- 
2.12.0

ef='/guix/commit/gnu/packages.scm?id=d42f648c0ce7b99d57e65fd37ba27014097c3cec'>commit</a><a href='/guix/diff/gnu/packages.scm?id=d42f648c0ce7b99d57e65fd37ba27014097c3cec'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages.scm'>
<input type='hidden' name='id' value='d42f648c0ce7b99d57e65fd37ba27014097c3cec'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d42f648c0ce7b99d57e65fd37ba27014097c3cec'>root</a>/<a href='/guix/log/gnu?id=d42f648c0ce7b99d57e65fd37ba27014097c3cec'>gnu</a>/<a href='/guix/log/gnu/packages.scm?id=d42f648c0ce7b99d57e65fd37ba27014097c3cec'>packages.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages.scm?id=d42f648c0ce7b99d57e65fd37ba27014097c3cec&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-06-06 22:43:30 +0200'>2022-06-06</span></td><td><a href='/guix/commit/gnu/packages.scm?id=635d49f97ee233bbb2673f97d7556c3c91b55889'>packages: Use SRFI-71 instead of SRFI-11.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-06 22:43:30 +0200'>2022-06-06</span></td><td><a href='/guix/commit/gnu/packages.scm?id=7041fe0646a9603e7d1d6bde139a284146515917'>packages: Add 'specifications-&gt;packages'.</a><span class='msg-avail'>...</span></td><td>Antero Mejr</td></tr>
<tr><td><span title='2022-04-04 22:58:03 +0200'>2022-04-04</span></td><td><a href='/guix/commit/gnu/packages.scm?id=f54f2aa9df5047b348ca104f5145af50c1a482f6'>packages: Add 'package-unique-version-prefix'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-11 20:34:59 +0100'>2022-01-11</span></td><td><a href='/guix/commit/gnu/packages.scm?id=0552dcb294bbfed76d7a495f5e368c53f20b852a'>shell: Cache profiles even when using package specs.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>