aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-02-05 07:39:21 -0500
committerBrian Ashworth <bosrsf04@gmail.com>2019-02-05 07:39:21 -0500
commit288e35f99eb7ee6a6ca5ba4c14fa666a409855e3 (patch)
tree0fadf790dd0f3e283e6c429fa94c85e74895f54e /sway
parent478b128c26057dcd7c97aaf5f91aa08dfce7d38f (diff)
IPC_COMMAND: split on newline
This splits commands given in IPC_COMMAND on newline to match i3's behavior.
Diffstat (limited to 'sway')
-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) {
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);