From 14ede244078ccdede32e86ad5fead4bc80f10903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Sun, 17 Mar 2024 18:48:26 -0400
Subject: [PATCH] Fix up exit codes on macOS
The issue was that the various semaphores and mutexes weren't being
initialized at all when sdl_initconio() wasn't called... so starting
the event thread and telling it to stop would access uncreated
semaphores and mutexes.
Split out the init, and be sure to call it before exiting.
---
src/conio/ciolib.c | 2 +-
src/conio/sdl_con.c | 22 ++++++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c
index 68a57a4af0..eaba484743 100644
--- a/src/conio/ciolib.c
+++ b/src/conio/ciolib.c
@@ -2028,8 +2028,8 @@ void main_stub(void *argptr)
args->ret = CIOLIB_main(args->argc, args->argv);
args->no_sdl = 1;
sem_post(&startsdl_sem);
- sem_post(&main_sem);
exit_sdl_con();
+ sem_post(&main_sem);
}
int main(int argc, char **argv)
diff --git a/src/conio/sdl_con.c b/src/conio/sdl_con.c
index 055dc33ee1..47602f6006 100644
--- a/src/conio/sdl_con.c
+++ b/src/conio/sdl_con.c
@@ -69,6 +69,7 @@ int sdl_init_good=0;
pthread_mutex_t sdl_keylock;
sem_t sdl_key_pending;
static unsigned int sdl_pending_mousekeys=0;
+static bool sdl_sync_initialized;
struct sdl_keyvals {
int keysym
@@ -193,6 +194,7 @@ const struct sdl_keyvals sdl_keyval[] =
void sdl_video_event_thread(void *data);
static void setup_surfaces(struct video_stats *vs);
+static int sdl_initsync(void);
static void sdl_user_func(int func, ...)
{
@@ -294,10 +296,9 @@ void exit_sdl_con(void)
{
// Avoid calling exit(0) from an atexit() function...
ciolib_reaper = 0;
- if (sdl_init_good)
- sdl_user_func_ret(SDL_USEREVENT_QUIT);
- else
- exit(0);
+ if (!sdl_sync_initialized)
+ sdl_initsync();
+ sdl_user_func_ret(SDL_USEREVENT_QUIT);
}
void sdl_copytext(const char *text, size_t buflen)
@@ -1030,7 +1031,7 @@ void sdl_video_event_thread(void *data)
if (sdl_init_good)
sdl_add_key(CIO_KEY_QUIT, &cvstat);
else
- exit(0);
+ return;
}
break;
case SDL_WINDOWEVENT:
@@ -1273,7 +1274,8 @@ void sdl_video_event_thread(void *data)
return;
}
-int sdl_initciolib(int mode)
+static int
+sdl_initsync(void)
{
#if defined(__DARWIN__)
if (initsdl_ret) {
@@ -1291,6 +1293,14 @@ int sdl_initciolib(int mode)
pthread_mutex_init(&win_mutex, NULL);
pthread_mutex_init(&sdl_keylock, NULL);
pthread_mutex_init(&sdl_mode_mutex, NULL);
+ sdl_sync_initialized = true;
+ return 0;
+}
+
+int sdl_initciolib(int mode)
+{
+ if (sdl_initsync() == -1)
+ return -1;
return(sdl_init(mode));
}
--
GitLab