summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-03-23 15:47:56 -0400
committerJune McEnroe <june@causal.agency>2020-03-23 15:47:56 -0400
commit35ae4121cba51d2d9a6aeecd076b0c20b4c7a0b3 (patch)
tree5f80634e0a3f500d48dc8ce13f432e32ab14dfa9
parentAdd M-Enter to insert a newline (diff)
downloadcatgirl-35ae4121cba51d2d9a6aeecd076b0c20b4c7a0b3.tar.gz
catgirl-35ae4121cba51d2d9a6aeecd076b0c20b4c7a0b3.zip
Fix non-multiline command newline handling
-rw-r--r--command.c7
1 files changed, 3 insertions, 4 deletions
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';
c93811edbc6&follow=1'>Replace #define with enum or const where possibleJune McEnroe 2018-03-31Link against ncursesJune McEnroe 2018-03-05Miscellaneous code cleanupJune McEnroe 2018-03-05Pass message structs by valueJune McEnroe 2018-03-05Use stdio in merge and metaJune McEnroe 2018-03-05Clean up spawn constantsJune McEnroe 2018-03-05Rename Tile timestamps {create,modify,access}TimeJune McEnroe 2018-03-05Pack message type enumsJune McEnroe 2018-03-05Undef COLOR_ constants in torus.hJune McEnroe 2018-03-05Generate tagsJune McEnroe 2017-10-03Simplify Makefile with pattern ruleJune McEnroe Insert rant about how GNU make handles the .c rule with extra dependencies. Also I don't care that everything links curses now. 2017-09-27Remove leading blank linesJune McEnroe 2017-09-27Add merge.c to READMEJune McEnroe 2017-09-03Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 34f25ae40a3db9369e9d98b3814f2b93bbc21451. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe