alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

No options when using sway as IPC client

Browse source 
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.
This commit is contained in:
Yacine Hmito 2016-02-25 22:19:33 +01:00
parent 179192e222
commit e239fbbd88
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/main.c
View file

@ -148,6 +148,9 @@ int main(int argc, char **argv) {
} }
if (optind < argc) { // Behave as IPC client 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 (getuid() != geteuid() || getgid() != getegid()) {
if (setgid(getgid()) != 0 || setuid(getuid()) != 0) { if (setgid(getgid()) != 0 || setuid(getuid()) != 0) {
sway_abort("Unable to drop root"); sway_abort("Unable to drop root");