mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix macOS single instance

Browse Source
This commit is contained in:
Kovid Goyal
2024-06-23 18:50:05 +05:30
parent b5cf999da9
commit 290c1742d5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kitty/launcher/single-instance.c
View File

@@ -39,6 +39,7 @@ log_error(const char *fmt, ...) {
va_end(ar);
}
#ifndef __APPLE__
static bool
is_ok_tmpdir(const char *x) {
if (!x || !x[0]) return false;
@@ -52,12 +53,13 @@ is_ok_tmpdir(const char *x) {
}
return false;
}
#endif
static void
get_socket_dir(char *output, size_t output_capacity) {
#define ret_if_ok(x) if (is_ok_tmpdir(x)) { if (snprintf(output, output_capacity, "%s", x) < output_capacity-1); return; }
#ifdef __APPLE__
if (confstr(_CS_DARWIN_USER_CACHE_DIR, output, output_capacity)) return output;
if (confstr(_CS_DARWIN_USER_CACHE_DIR, output, output_capacity)) return;
snprintf(output, output_capacity, "%s", "/Library/Caches");
#else
#define test_env(x) { const char *e = getenv(#x); ret_if_ok(e); }
@@ -242,9 +244,10 @@ talk_to_instance(int s, struct sockaddr_un *server_addr, int argc, char *argv[],
w("}");
#undef w
size_t addr_len = strlen(server_addr->sun_path);
if (!addr_len) addr_len = strlen(server_addr->sun_path + 1) + 1;
if (safe_connect(s, (struct sockaddr*)server_addr, sizeof(sa_family_t) + addr_len) != 0) {
size_t addr_len = sizeof(sa_family_t);
if (!server_addr->sun_path[0]) addr_len += 1 + strlen(server_addr->sun_path + 1);
else addr_len = sizeof(*server_addr);
if (safe_connect(s, (struct sockaddr*)server_addr, addr_len) != 0) {
fail_on_errno("Failed to connect to single instance socket");
}
size_t pos = 0;