aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2019-02-05 14:39:10 +0100
committerLibravatar GitHub <noreply@github.com>2019-02-05 14:39:10 +0100
commita6363d1206784c4f28df47801f2d6fb1709587dc (patch)
treea8dccb095e9c53a413fb15764f9777a8ef1884bf
parentMerge pull request #3578 from jubalh/version (diff)
parentIPC_COMMAND: split on newline (diff)
downloadsway-a6363d1206784c4f28df47801f2d6fb1709587dc.tar.gz
sway-a6363d1206784c4f28df47801f2d6fb1709587dc.tar.zst
sway-a6363d1206784c4f28df47801f2d6fb1709587dc.zip
Merge pull request #3573 from RedSoxFan/ipc-newlines
IPC_COMMAND: split on newline
-rw-r--r--sway/ipc-server.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index d1920cfd..eb6f159d 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -595,6 +595,16 @@ void ipc_client_handle_command(struct ipc_client *client) {
595 switch (client->current_command) { 595 switch (client->current_command) {
596 case IPC_COMMAND: 596 case IPC_COMMAND:
597 { 597 {
598 char *line = strtok(buf, "\n");
599 while (line) {
600 size_t line_length = strlen(line);
601 if (line + line_length >= buf + client->payload_length) {
602 break;
603 }
604 line[line_length] = ';';
605 line = strtok(NULL, "\n");
606 }
607
598 list_t *res_list = execute_command(buf, NULL, NULL); 608 list_t *res_list = execute_command(buf, NULL, NULL);
599 transaction_commit_dirty(); 609 transaction_commit_dirty();
600 char *json = cmd_results_to_json(res_list); 610 char *json = cmd_results_to_json(res_list);