mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-09-20 20:51:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

common/ipc-client: stop using --get-socketpath

Browse Source 
`sway --get-socketpath` just returns SWAYSOCK if set, and nothing
otherwise. Thus it does nothing more than the simple env var check
right above. Let's remove it.
This commit is contained in:
Simon Ser 2021-07-08 13:09:53 +02:00
parent e39b0b816b
commit 0518063983
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/ipc-client.c
View File

@ -18,38 +18,10 @@ char *get_socketpath(void) {
if (swaysock) { if (swaysock) {
return strdup(swaysock); return strdup(swaysock);
} }
char *line = NULL;
size_t line_size = 0;
FILE *fp = popen("sway --get-socketpath 2>/dev/null", "r");
if (fp) {
ssize_t nret = getline(&line, &line_size, fp);
pclose(fp);
if (nret > 0) {
// remove trailing newline, if there is one
if (line[nret - 1] == '\n') {
line[nret - 1] = '\0';
}
return line;
}
}
const char *i3sock = getenv("I3SOCK"); const char *i3sock = getenv("I3SOCK");
if (i3sock) { if (i3sock) {
free(line);
return strdup(i3sock); return strdup(i3sock);
} }
fp = popen("i3 --get-socketpath 2>/dev/null", "r");
if (fp) {
ssize_t nret = getline(&line, &line_size, fp);
pclose(fp);
if (nret > 0) {
// remove trailing newline, if there is one
if (line[nret - 1] == '\n') {
line[nret - 1] = '\0';
}
return line;
}
}
free(line);
return NULL; return NULL;
} }