Port to use getline.h from dxcommon.

[cdecl99.git] / src / error.c

diff --git a/src/error.c b/src/error.c
index a2d705a8d15885f8e8d20986c5f99098a48bb786..e07a410f66abd8b460771eb5de11b6e6229cd622 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -20,36 +20,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <stdbool.h>
 
 #include "cdecl.h"
 #include "cdecl-internal.h"
-
-#include <glthread/lock.h>
-#include <glthread/tls.h>
-
 #include "errmsg.h"
 
-struct err_state {
-       struct cdecl_error err;
-       size_t nstr;
-       char str[FLEXIBLE_ARRAY_MEMBER];
-};
-
 /* This pre-initialized error is reserved for dire out-of-memory conditions. */
 static struct cdecl_error err_no_mem;
-static gl_tls_key_t tls_key;
-
-static void free_err(void *err)
-{
-       if (err == &err_no_mem)
-               return;
-
-       free(err);
-}
 
 static void set_err(unsigned code, struct cdecl_error *err)
 {
-       static const char errmsgs[] = STRTAB_INITIALIZER;
+       static const char _Alignas(1) errmsgs[] = STRTAB_INITIALIZER;
 
        switch (code) {
        case CDECL__ENOMEM:
@@ -63,16 +45,43 @@ static void set_err(unsigned code, struct cdecl_error *err)
        err->str = _(&errmsgs[code]);
 }
 
-static void initialize_cb(void)
+static void init_once_cb(void)
 {
 #if ENABLE_NLS
        bindtextdomain(PACKAGE, LOCALEDIR);
        bindtextdomain("bison-runtime", BISON_LOCALEDIR);
 #endif
        set_err(CDECL__ENOMEM, &err_no_mem);
-       gl_tls_key_init(tls_key, free_err);
 }
 
+#if USE_POSIX_THREADS
+#  include "thread-posix.h"
+#elif USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS
+#  include "thread-stdc.h"
+#elif USE_WINDOWS_THREADS
+#  include "thread-w32.h"
+#else
+static void *tls_key;
+enum { tls_key_valid = 1 };
+
+#define tls_get() tls_key
+#define tls_set(a) ((tls_key = (a)), 1)
+
+static int init_once(void)
+{
+       if (!err_no_mem.code)
+               init_once_cb();
+       return 1;
+}
+
+#endif
+
+struct err_state {
+       struct cdecl_error err;
+       size_t nstr;
+       char str[FLEXIBLE_ARRAY_MEMBER];
+};
+
 static void *alloc_err_state(void *old, size_t buf_size)
 {
        struct err_state *state;
@@ -81,29 +90,32 @@ static void *alloc_err_state(void *old, size_t buf_size)
        state = p = realloc(old, offsetof(struct err_state, str) + buf_size);
        if (state) {
                state->nstr = buf_size;
+               if (!tls_set(state)) {
+                       /*
+                        * We have to presume that pthread_setspecific etc.
+                        * cannot fail after the key has been successfully
+                        * assigned once, because there seems to be no
+                        * reasonable recovery from such a scenario.
+                        */
+                       free(p);
+                       p = NULL;
+               }
        } else if (old) {
                /* Failed allocation, but existing state is still good */
                p = old;
-       } else {
-               /* Failed allocation, no existing state */
-               p = &err_no_mem;
        }
 
-       gl_tls_set(tls_key, p);
-       return state;
+       return p;
 }
 
 static struct err_state *get_err_state(void)
 {
        void *state;
 
-       gl_once_define(static, tls_initialized)
-       gl_once(tls_initialized, initialize_cb);
+       if (!init_once())
+               return NULL;
 
-       state = gl_tls_get(tls_key);
-       if (state == &err_no_mem)
-               state = NULL;
-       if (!state)
+       if (!(state = tls_get()))
                return alloc_err_state(state, 100);
        return state;
 }
@@ -180,7 +192,7 @@ void cdecl__err(const char *fmt, const char *arg)
 retry:
        rc = fmt_err(state, fmt, arg);
        if (rc >= state->nstr) {
-               assert(try++ == 0 && rc < SIZE_MAX / 4);
+               assert(try++ == 0 && rc < (size_t)-1 / 4);
 
                state = alloc_err_state(state, (size_t)(rc+1u) * 3 / 2);
                if (!state)
@@ -197,5 +209,5 @@ const struct cdecl_error *cdecl_get_error(void)
 {
        struct err_state *state = get_err_state();
 
-       return state ? &state->err : NULL;
+       return state ? &state->err : &err_no_mem;
 }