From 35ae4121cba51d2d9a6aeecd076b0c20b4c7a0b3 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Mon, 23 Mar 2020 15:47:56 -0400
Subject: Fix non-multiline command newline handling

---
 command.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'command.c')

diff --git a/command.c b/command.c
index 1d1a87b..5da8bb9 100644
--- a/command.c
+++ b/command.c
@@ -465,12 +465,11 @@ void command(uint id, char *input) {
 		uiFormat(id, Warm, NULL, "Command %s is restricted", cmd);
 		return;
 	}
-	if (!(handler->flags & Multiline)) {
-		char *nl = strchr(input, '\n');
-		if (nl) *nl = '\0';
-	}
 
 	if (input) {
+		if (!(handler->flags & Multiline)) {
+			input[strcspn(input, "\n")] = '\0';
+		}
 		input += strspn(input, " ");
 		size_t len = strlen(input);
 		while (input[len - 1] == ' ') input[--len] = '\0';
-- 
cgit 1.4.1


<tr><td class='sub'>dontfiles
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/src/'>summary</a> <a href='/src/refs/?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec'>refs</a> <a class='active' href='/src/log/doc/zlib/deflatePrime.3?follow=1'>log</a> <a href='/src/tree/doc/zlib/deflatePrime.3?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec'>tree</a> <a href='/src/commit/doc/zlib/deflatePrime.3?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec&amp;follow=1'>commit</a> <a href='/src/diff/doc/zlib/deflatePrime.3?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/doc/zlib/deflatePrime.3'>
<input type='hidden' name='id' value='d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec'/><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='/src/log/?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec&amp;follow=1'>root</a>/<a href='/src/log/doc?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec&amp;follow=1'>doc</a>/<a href='/src/log/doc/zlib?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec&amp;follow=1'>zlib</a>/<a href='/src/log/doc/zlib/deflatePrime.3?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec&amp;follow=1'>deflatePrime.3</a> (<a href='/src/log/doc/zlib/deflatePrime.3?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/doc/zlib/deflatePrime.3?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-02-06 20:23:45 -0500'>2021-02-06</span></td><td><a href='/src/commit/home/.xsession?id=1577ad23c4cd5417fbddbec457041823168ddbda&amp;follow=1'>Add initial OpenBSD X configuration</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2021-02-06 19:48:14 -0500'>2021-02-06</span></td><td><a href='/src/commit/bin/scheme.c?id=0de28f7b4c5b1a2e1ece82043987c4f07b78a9ec&amp;follow=1'>Add xterm output to scheme</a></td><td>June McEnroe