diff options
| author | Craig Barnes <craigbarnes@protonmail.com> | 2024-08-03 09:42:37 +0000 |
|---|---|---|
| committer | Craig Barnes <craigbarnes@protonmail.com> | 2024-08-03 09:42:37 +0000 |
| commit | b27841e1b590f91c9de21bb694909211421e5f96 (patch) | |
| tree | 6f0f5a1fec321ae8c96e1bc019cc625d50b35012 /config.c | |
| parent | osc: kitty notifications: ignore invalid IDs (diff) | |
| parent | xmalloc: remove delim param from xstrjoin() and add separate xstrjoin3() (diff) | |
Merge branch 'xstrjoin3'
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -356,9 +356,9 @@ open_config(void) /* First, check XDG_CONFIG_HOME (or .config, if unset) */ if (xdg_config_home != NULL && xdg_config_home[0] != '\0') - path = xstrjoin(xdg_config_home, "/foot/foot.ini", 0); + path = xstrjoin(xdg_config_home, "/foot/foot.ini"); else if (home_dir != NULL) - path = xstrjoin(home_dir, "/.config/foot/foot.ini", 0); + path = xstrjoin(home_dir, "/.config/foot/foot.ini"); if (path != NULL) { LOG_DBG("checking for %s", path); @@ -383,7 +383,7 @@ open_config(void) conf_dir = strtok(NULL, ":")) { free(path); - path = xstrjoin(conf_dir, "/foot/foot.ini", 0); + path = xstrjoin(conf_dir, "/foot/foot.ini"); LOG_DBG("checking for %s", path); int fd = open(path, O_RDONLY | O_CLOEXEC); @@ -843,7 +843,7 @@ parse_section_main(struct context *ctx) return false; } - _include_path = xasprintf("%s/%s", home_dir, value + 2); + _include_path = xstrjoin3(home_dir, "/", value + 2); include_path = _include_path; } else include_path = value; @@ -2931,7 +2931,7 @@ get_server_socket_path(void) const char *wayland_display = getenv("WAYLAND_DISPLAY"); if (wayland_display == NULL) { - return xstrjoin(xdg_runtime, "/foot.sock", 0); + return xstrjoin(xdg_runtime, "/foot.sock"); } return xasprintf("%s/foot-%s.sock", xdg_runtime, wayland_display); |
