aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-03-09 17:49:44 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-03-09 17:49:44 +0000
commitfc7b3b2d85cc3cff87c367cb9022a3d049b9dcec (patch)
tree0b968b01b339b6af3806fe11aab6b2d88f73fd22 /config.c
parentfootrc: add default key bindings (diff)
parentserver/client: add XDG_SESSION_ID to the default socket path (diff)
Merge branch 'master' into bindings
Diffstat (limited to 'config.c')
-rw-r--r--config.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/config.c b/config.c
index 124c76b6..7d7fe18d 100644
--- a/config.c
+++ b/config.c
@@ -413,6 +413,12 @@ parse_section_csd(const char *key, const char *value, struct config *conf,
conf->csd.color.close_set = true;
conf->csd.color.close = color;
}
+
+ else {
+ LOG_WARN("%s:%u: invalid key: %s", path, lineno, key);
+ return false;
+ }
+
return true;
}
@@ -561,12 +567,16 @@ err:
static char *
get_server_socket_path(void)
{
+ const char *xdg_session_id = getenv("XDG_SESSION_ID");
const char *xdg_runtime = getenv("XDG_RUNTIME_DIR");
if (xdg_runtime == NULL)
return strdup("/tmp/foot.sock");
- char *path = malloc(strlen(xdg_runtime) + 1 + strlen("foot.sock") + 1);
- sprintf(path, "%s/foot.sock", xdg_runtime);
+ if (xdg_session_id == NULL)
+ xdg_session_id = "<no-session>";
+
+ char *path = malloc(strlen(xdg_runtime) + 1 + strlen("foot-.sock") + strlen(xdg_session_id) + 1);
+ sprintf(path, "%s/foot-%s.sock", xdg_runtime, xdg_session_id);
return path;
}