From 0518063983e76b379619f2ec08f5cd030bcc4e27 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 8 Jul 2021 13:09:53 +0200 Subject: [PATCH] common/ipc-client: stop using --get-socketpath `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. --- common/ipc-client.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/common/ipc-client.c b/common/ipc-client.c index d30212d25..7038b2c52 100644 --- a/common/ipc-client.c +++ b/common/ipc-client.c @@ -18,38 +18,10 @@ char *get_socketpath(void) { if (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"); if (i3sock) { - free(line); 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; }