aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-02-05 07:39:21 -0500
committerDrew DeVault <sir@cmpwn.com>2019-02-11 10:15:00 -0500
commit41e10db0de243c903e28ae8f0b669ff681974e69 (patch)
tree0fadf790dd0f3e283e6c429fa94c85e74895f54e
parent610794d4e3b2d8434f4ea3ef518bcdfc8a2dc28c (diff)
downloadsway-41e10db0de243c903e28ae8f0b669ff681974e69.zip
sway-41e10db0de243c903e28ae8f0b669ff681974e69.tar.gz
sway-41e10db0de243c903e28ae8f0b669ff681974e69.tar.bz2
IPC_COMMAND: split on newline
This splits commands given in IPC_COMMAND on newline to match i3's behavior.
-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 d1920cf..eb6f159 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -595,6 +595,16 @@ void ipc_client_handle_command(struct ipc_client *client) {
switch (client->current_command) {
case IPC_COMMAND:
{
+ char *line = strtok(buf, "\n");
+ while (line) {
+ size_t line_length = strlen(line);
+ if (line + line_length >= buf + client->payload_length) {
+ break;
+ }
+ line[line_length] = ';';
+ line = strtok(NULL, "\n");
+ }
+
list_t *res_list = execute_command(buf, NULL, NULL);
transaction_commit_dirty();
char *json = cmd_results_to_json(res_list);