X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/c9ec41ecea841cac0ad1aa265cdc6859a61c4ac2..032fe50c0297846a8d03eda505c9726f60a46501:/src/error.c
diff --git a/src/error.c b/src/error.c
index 8d26d5b..cf4411e 100644
--- a/src/error.c
+++ b/src/error.c
@@ -1,39 +1,43 @@
+/*
+ * Error handling for libcdecl.
+ * Copyright © 2011-2012, 2021, 2023 Nick Bowler
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
#include
+#include
#include
-#include
#include
+
+#include "cdecl.h"
+#include "cdecl-internal.h"
+
#include
#include
-#include "cdecl.h"
-#include "error.h"
-#include "i18n.h"
-gl_once_define(static, tls_initialized);
-static gl_tls_key_t tls_key;
+#include "errmsg.h"
struct err_state {
struct cdecl_error err;
size_t nstr;
- char str[];
+ char str[FLEXIBLE_ARRAY_MEMBER];
};
-/* This error is reserved for extremely dire out-of-memory conditions. */
-static struct err_state err_no_mem = {
- .err = {
- .code = CDECL_ENOMEM,
- .str = NULL,
- },
-};
-
-const char *cdecl__strerror(unsigned code)
-{
-# include "errtab.h"
-
- assert(code < sizeof offtab / sizeof offtab[0]);
- assert(offtab[code] != 0);
-
- return gettext((char *)&strtab + offtab[code]);
-}
+/* 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)
{
@@ -43,76 +47,124 @@ static void free_err(void *err)
free(err);
}
-static void set_error(const struct cdecl_error *err)
+static void set_err(unsigned code, struct cdecl_error *err)
{
- struct err_state *state;
- size_t need_len = 0;
+ static const char errmsgs[] = STRTAB_INITIALIZER;
+
+ switch (code) {
+ case CDECL__ENOMEM:
+ err->code = CDECL_ENOMEM;
+ break;
+ default:
+ err->code = CDECL_ENOPARSE;
+ break;
+ }
- if (err->str) {
- need_len = strlen(err->str) + 1;
+ err->str = _(&errmsgs[code]);
+}
+
+static void initialize_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);
+}
+
+static void *alloc_err_state(void *old, size_t buf_size)
+{
+ struct err_state *state;
+ void *p;
+
+ state = p = realloc(old, offsetof(struct err_state, str) + buf_size);
+ if (state) {
+ state->nstr = buf_size;
+ } 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;
+}
+
+static struct err_state *get_err_state(void)
+{
+ void *state;
+
+ gl_once_define(static, tls_initialized)
+ gl_once(tls_initialized, initialize_cb);
+
state = gl_tls_get(tls_key);
if (state == &err_no_mem)
state = NULL;
- if (!state || state->nstr < need_len) {
- struct err_state *tmp;
-
- tmp = realloc(state, sizeof *state + need_len);
- if (!tmp) {
- /* Re-use the existing state buffer, if any. */
- if (state)
- state->err = err_no_mem.err;
- else
- state = &err_no_mem;
-
- gl_tls_set(tls_key, state);
- return;
- }
+ if (!state)
+ return alloc_err_state(state, 100);
+ return state;
+}
- state = tmp;
- state->nstr = need_len;
- gl_tls_set(tls_key, state);
- }
- state->err = *err;
- if (err->str) {
- memcpy(state->str, err->str, need_len);
- state->err.str = state->str;
- } else {
- state->err.str = cdecl__strerror(state->err.code);
- }
+#if ENABLE_NLS
+/*
+ * Initialize gettext indirectly via get_err_state.
+ */
+void cdecl__init_i18n(void)
+{
+ get_err_state();
}
+#endif
-static void initialize(void)
+/*
+ * Set the library error to one of the preset messages defined in errmsg.h
+ * (CDECL__Exxx).
+ */
+void cdecl__errmsg(unsigned msg)
{
- cdecl__init_i18n();
- err_no_mem.err.str = cdecl__strerror(CDECL_ENOMEM);
+ struct err_state *state;
- gl_tls_key_init(tls_key, free_err);
+ state = get_err_state();
+ if (!state)
+ return;
- /*
- * This default error message is a stop-gap measure until all library
- * error conditions use the new interface.
- */
- set_error(&(const struct cdecl_error){ .code = CDECL_ENOPARSE });
+ set_err(msg, &state->err);
}
-const struct cdecl_error *cdecl_get_error(void)
+/*
+ * Sets the library error to code; fmt is a printf-style string that may use
+ * up to one %s directive, to refer to arg.
+ */
+void cdecl__err(unsigned code, const char *fmt, const char *arg)
{
struct err_state *state;
+ int rc, try = 0;
- gl_once(tls_initialized, initialize);
+ state = get_err_state();
+ if (!state)
+ return;
- state = gl_tls_get(tls_key);
- assert(state);
+retry:
+ rc = snprintf(state->str, state->nstr, fmt, arg);
+ if (rc > 0 && rc >= state->nstr) {
+ assert(try++ == 0 && rc < SIZE_MAX / 4);
+ state = alloc_err_state(state, (size_t)(rc+1u) * 3 / 2);
+ if (!state)
+ return;
- return &state->err;
+ goto retry;
+ }
+
+ state->err.str = state->str;
+ state->err.code = code;
}
-void cdecl__set_error(const struct cdecl_error *err)
+const struct cdecl_error *cdecl_get_error(void)
{
- gl_once(tls_initialized, initialize);
+ struct err_state *state = get_err_state();
- set_error(err);
+ return state ? &state->err : NULL;
}