diff options
| author | Guillaume Outters <guillaume-github@outters.eu> | 2025-02-13 15:16:43 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2025-02-16 12:55:00 +0000 |
| commit | d66a00678d434afbdf31dbaad61b9837983ecc6e (patch) | |
| tree | ae0d35134dcf342e9a0d7355462fdf9ed0a5e70d | |
| parent | term: append zero-width grapheme breaking characters to previous cell (diff) | |
server: fix --server=<fd> on OSes returning SO_ACCEPTCONN > 1
Closes #1956
| -rw-r--r-- | server.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -4,6 +4,7 @@ #include <fcntl.h> #include <unistd.h> #include <errno.h> +#include <limits.h> #include <sys/types.h> #include <sys/socket.h> @@ -23,6 +24,8 @@ #include "wayland.h" #include "xmalloc.h" +#define NON_ZERO_OPT (INT_MIN / 7) + struct client; struct terminal_instance; @@ -474,7 +477,7 @@ prepare_socket(int fd) } int const socket_options[] = { SO_DOMAIN, SO_ACCEPTCONN, SO_TYPE }; - int const socket_options_values[] = { AF_UNIX, 1, SOCK_STREAM}; + int const socket_options_values[] = { AF_UNIX, NON_ZERO_OPT, SOCK_STREAM}; char const * const socket_options_names[] = { "SO_DOMAIN", "SO_ACCEPTCONN", "SO_TYPE" }; xassert(ALEN(socket_options) == ALEN(socket_options_values)); @@ -489,6 +492,8 @@ prepare_socket(int fd) LOG_ERRNO("failed to read socket option from passed file descriptor"); return false; } + if (socket_options_values[i] == NON_ZERO_OPT && socket_option) + socket_option = NON_ZERO_OPT; if (socket_option != socket_options_values[i]) { LOG_ERR("wrong socket value for socket option '%s' on passed file descriptor", socket_options_names[i]); |
