aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Gautier <mg@max.gautier.name>2023-03-09 13:13:57 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-07-21 06:12:49 +0000
commitc12db68363131d189d8410bf2994d70919229021 (patch)
tree25e0d489630318658793587f22df75abcb8edf19
parentvt: improve handling of HTS (diff)
footclient: fallback logic when socket paths don't exist
Even if WAYLAND_DISPLAY / XDG_RUNTIME_DIR are defined, if we can't find the corresponding socket, we fallback to the path used when they are not defined.
-rw-r--r--client.c15
-rw-r--r--doc/footclient.1.scd5
2 files changed, 14 insertions, 6 deletions
diff --git a/client.c b/client.c
index 99c7c1e8..41be68a9 100644
--- a/client.c
+++ b/client.c
@@ -374,16 +374,19 @@ main(int argc, char *const *argv)
const char *xdg_runtime = getenv("XDG_RUNTIME_DIR");
if (xdg_runtime != NULL) {
const char *wayland_display = getenv("WAYLAND_DISPLAY");
- if (wayland_display != NULL)
+ if (wayland_display != NULL) {
snprintf(addr.sun_path, sizeof(addr.sun_path),
"%s/foot-%s.sock", xdg_runtime, wayland_display);
- else
+ connected = (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == 0);
+ }
+ if (!connected) {
+ LOG_WARN("%s: failed to connect, will now try %s/foot.sock",
+ addr.sun_path, xdg_runtime);
snprintf(addr.sun_path, sizeof(addr.sun_path),
"%s/foot.sock", xdg_runtime);
-
- if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == 0)
- connected = true;
- else
+ connected = (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == 0);
+ }
+ if (!connected)
LOG_WARN("%s: failed to connect, will now try /tmp/foot.sock", addr.sun_path);
}
diff --git a/doc/footclient.1.scd b/doc/footclient.1.scd
index 1464700c..7d89b9ed 100644
--- a/doc/footclient.1.scd
+++ b/doc/footclient.1.scd
@@ -146,6 +146,11 @@ terminfo entries manually, by copying *foot* and *foot-direct* to
Used to construct the default _PATH_ for the *--server-socket*
option, when no explicit argument is given (see above).
+If the socket at default _PATH_ does not exist, *footclient* will
+fallback to the less specific path, with the following priority:
+*$XDG\_RUNTIME\_DIR/foot-$WAYLAND\_DISPLAY.sock*,
+*$XDG\_RUNTIME\_DIR/foot.sock*, */tmp/foot.sock*.
+
## Variables set in the child process
*TERM*