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

9319c8e9d'>tree</a><a href='/guix/commit/gnu/installer/user.scm?id=e6e4e88f4531cc473b3c221f0bf53539319c8e9d'>commit</a><a href='/guix/diff/gnu/installer/user.scm?id=e6e4e88f4531cc473b3c221f0bf53539319c8e9d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/user.scm'>
<input type='hidden' name='id' value='e6e4e88f4531cc473b3c221f0bf53539319c8e9d'/><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=e6e4e88f4531cc473b3c221f0bf53539319c8e9d'>root</a>/<a href='/guix/log/gnu?id=e6e4e88f4531cc473b3c221f0bf53539319c8e9d'>gnu</a>/<a href='/guix/log/gnu/installer?id=e6e4e88f4531cc473b3c221f0bf53539319c8e9d'>installer</a>/<a href='/guix/log/gnu/installer/user.scm?id=e6e4e88f4531cc473b3c221f0bf53539319c8e9d'>user.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/installer/user.scm?id=e6e4e88f4531cc473b3c221f0bf53539319c8e9d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-22 16:00:29 +0200'>2022-09-22</span></td><td><a href='/guix/commit/gnu/installer/user.scm?id=4814ec284f8a2870e6457c05f414ad31df4e3f57'>installer: Move &lt;secret&gt; to utils and use it for crypt passwords.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/user.scm (&lt;secret&gt;, secret?, make-secret, secret-content): Move
to utils.scm.
* gnu/installer/utils.scm (&lt;secret&gt;, secret?, make-secret, secret-content):
Moved from user.scm.
* gnu/installer/newt/partition.scm (prompt-luks-passwords): Make password a
&lt;secret&gt;.
* gnu/installer/parted.scm (luks-format-and-open): Unwrap secret.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2022-08-08 11:54:25 +0200'>2022-08-08</span></td><td><a href='/guix/commit/gnu/installer/user.scm?id=ff9522fb69b9f4a31a5b766029e26dc53a2d1cf8'>installer: Add comments and vertical space to the generated config.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/parted.scm (user-partitions-&gt;configuration): Introduce
vertical space and a comment.
* gnu/installer/services.scm (G_): New macro.
(%system-services): Add comment for OpenSSH.
(system-services-&gt;configuration): Add vertical space and comments.
* gnu/installer/user.scm (users-&gt;configuration): Add comment.
* gnu/installer/steps.scm (format-configuration): Add comment.
(configuration-&gt;file): Expound leading comment.  Pass #:format-comment
to 'pretty-print-with-comments/splice'.
</span></span></td><td>Ludovic Courtès</td></tr>