walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Factor xrdb function into a popen-like function

This commit is contained in:
Francesco Abbate 2021-03-19 13:46:01 +01:00
parent aee602ea2f
commit 679e1d9a22
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/xrdb_parse.c
View File

@ -23,7 +23,9 @@ static int join_path(char buf[], int buf_size, const char *path, const char *nam
} }
static int xrdb_popen (int *pid_ptr) { /* Lauch a child process using execve and pipe its output into a file
descriptor (returned by the function). */
static int process_open_output(char * const argv[], int *pid_ptr) {
int fd[2]; int fd[2];
if (pipe(fd) != 0) return -1; if (pipe(fd) != 0) return -1;
@ -36,11 +38,10 @@ static int xrdb_popen (int *pid_ptr) {
dup2(write_fd, STDOUT_FILENO); dup2(write_fd, STDOUT_FILENO);
close(write_fd); close(write_fd);
char *path = getenv("PATH"); char *path = getenv("PATH");
char xrdb_filename[256]; char exec_filename[256];
while (path) { while (path) {
char *xrgb_argv[3] = {"xrdb", "-query", NULL}; if (join_path(exec_filename, 256, path, argv[0]) == 0) {
if (join_path(xrdb_filename, 256, path, "xrdb") == 0) { execve(exec_filename, argv, environ);
execve(xrdb_filename, xrgb_argv, environ);
} }
path = strchr(path, ':'); path = strchr(path, ':');
if (path) { if (path) {
@ -125,7 +126,7 @@ static int xrdb_parse_for_dpi(int read_fd) {
int xrdb_find_dpi() { int xrdb_find_dpi() {
int xrdb_pid; int xrdb_pid;
int read_fd = xrdb_popen(&xrdb_pid); int read_fd = process_open_output((char *[]) {"xrdb", "-query", NULL}, &xrdb_pid);
if (read_fd >= 0) { if (read_fd >= 0) {
int dpi_read = xrdb_parse_for_dpi(read_fd); int dpi_read = xrdb_parse_for_dpi(read_fd);
int child_status; int child_status;