KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #5371

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-12 08:15:25 +05:30
parent d4075bfa9a
commit aa0b07a90d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
prewarm-launcher.c
View File

@ -66,6 +66,16 @@ const static int has_splice = 0;
memmove((array) + (i), (array) + (i) + 1, sizeof((array)[0]) * ((count) - (i))); \ memmove((array) + (i), (array) + (i) + 1, sizeof((array)[0]) * ((count) - (i))); \
}} }}
// ancient macs (10.15) have no MSG_NOSIGNAL
#ifndef MSG_NOSIGNAL
# define MSG_NOSIGNAL 0
# ifdef SO_NOSIGPIPE
# define KITTY_USE_SO_NOSIGPIPE
# else
# error "Cannot block SIGPIPE!"
# endif
#endif
typedef struct transfer_buf { typedef struct transfer_buf {
char *buf; char *buf;
size_t sz; size_t sz;
@ -786,6 +796,12 @@ use_prewarmed_process(int argc, char *argv[], char *envp[]) {
if (!create_launch_msg(argc, argv)) fail("Failed to create launch message"); if (!create_launch_msg(argc, argv)) fail("Failed to create launch message");
socket_fd = connect_to_socket_synchronously(env_addr); socket_fd = connect_to_socket_synchronously(env_addr);
if (socket_fd < 0) fail("Failed to connect to prewarm socket"); if (socket_fd < 0) fail("Failed to connect to prewarm socket");
#ifdef KITTY_USE_SO_NOSIGPIPE
{
int val = 1;
if (setsockopt(socket_fd, SOL_SOCKET, SO_NOSIGPIPE, (void*)&val, sizeof(val)) != 0) fail("Failed to set SO_NOSIGPIPE");
}
#endif
from_child_tty.buf = malloc(IO_BUZ_SZ * 2); from_child_tty.buf = malloc(IO_BUZ_SZ * 2);
if (!from_child_tty.buf) fail("Out of memory allocating IO buffer"); if (!from_child_tty.buf) fail("Out of memory allocating IO buffer");
to_child_tty.buf = from_child_tty.buf + IO_BUZ_SZ; to_child_tty.buf = from_child_tty.buf + IO_BUZ_SZ;