From e239fbbd881f129999cac83f3cc150c16781fe3a Mon Sep 17 00:00:00 2001 From: Yacine Hmito Date: Thu, 25 Feb 2016 22:19:33 +0100 Subject: [PATCH] No options when using sway as IPC client Sway used to attempt sending an IPC command composed of every argument after the first non-option argument encountered. Now, raises an error if an option is encountered before the intended command. Some options such as -h or -v take effect when parsing, so they still apply. --- sway/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sway/main.c b/sway/main.c index 442d36ee..2c5144ba 100644 --- a/sway/main.c +++ b/sway/main.c @@ -148,6 +148,9 @@ int main(int argc, char **argv) { } if (optind < argc) { // Behave as IPC client + if(optind != 1) { + sway_abort("Don't use options with the IPC client"); + } if (getuid() != geteuid() || getgid() != getegid()) { if (setgid(getgid()) != 0 || setuid(getuid()) != 0) { sway_abort("Unable to drop root");