mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-13 05:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #494 from gpyh/argsegfault

Browse Source 
Fix segfault when trying to use sway as IPC without a sway instance
This commit is contained in:
Drew DeVault 2016-02-25 18:09:20 -05:00
commit 40b3215444
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sway/main.c
View File

@ -25,6 +25,7 @@ static bool terminate_request = false;
void sway_terminate(void) { void sway_terminate(void) {
terminate_request = true; terminate_request = true;
wlc_terminate(); wlc_terminate();
exit(EXIT_FAILURE);
} }
void sig_handler(int signal) { void sig_handler(int signal) {
@ -103,7 +104,7 @@ int main(int argc, char **argv) {
int c; int c;
while (1) { while (1) {
int option_index = 0; int option_index = 0;
c = getopt_long(argc, argv, "hCdvVpc:", long_options, &option_index); c = getopt_long(argc, argv, "hCdvVc:", long_options, &option_index);
if (c == -1) { if (c == -1) {
break; break;
} }
@ -148,6 +149,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");

2
sway/sway.5.txt
View File

@ -16,7 +16,7 @@ startup. These commands usually consist of setting your preferences and setting
key bindings. An example config is likely present in /etc/sway/config for you to key bindings. An example config is likely present in /etc/sway/config for you to
check out. check out.
All of these commands may be issued at runtime through **sway-msg**(1). All of these commands may be issued at runtime through **swaymsg**(1).
Commands Commands
-------- --------