mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-03 19:07:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove readline.c

Browse source 
All occurrences of read_line have been replaced by getline.
peek_line has been absorbed into detect_brace.
This commit is contained in:
Ian Fan 2018-12-09 12:09:11 +00:00
parent 967566e37f
commit a82b8a3c14
11 changed files with 118 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/ipc-client.c
View file

@ -7,7 +7,6 @@
#include <sys/un.h>
#include <unistd.h>
#include "ipc-client.h"
#include "readline.h"
#include "log.h"
static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'};
@ -18,28 +17,30 @@ 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) {
char *line = read_line(fp);
getline(&line, &line_size, fp);
pclose(fp);
if (line && *line) {
return line;
}
free(line);
}
const char *i3sock = getenv("I3SOCK");
if (i3sock) {
free(line);
return strdup(i3sock);
}
fp = popen("i3 --get-socketpath 2>/dev/null", "r");
if (fp) {
char *line = read_line(fp);
getline(&line, &line_size, fp);
pclose(fp);
if (line && *line) {
return line;
}
free(line);
}
free(line);
return NULL;
}