/*
* Error handling for libcdecl.
- * Copyright © 2011-2012, 2021, 2023 Nick Bowler
+ * Copyright © 2011-2012, 2021, 2023-2024 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
#include "errmsg.h"
-gl_once_define(static, tls_initialized)
-static gl_tls_key_t tls_key;
-
struct err_state {
struct cdecl_error err;
size_t nstr;
/* 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)
{
err->str = _(&errmsgs[code]);
}
-static void initialize(void)
+static void initialize_cb(void)
{
- cdecl__init_i18n();
+#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);
}
{
void *state;
- gl_once(tls_initialized, initialize);
+ gl_once_define(static, tls_initialized)
+ gl_once(tls_initialized, initialize_cb);
state = gl_tls_get(tls_key);
if (state == &err_no_mem)
return state;
}
+
+#if ENABLE_NLS
+/*
+ * Initialize gettext indirectly via get_err_state.
+ */
+void cdecl__init_i18n(void)
+{
+ get_err_state();
+}
+#endif
+
/*
* Set the library error to one of the preset messages defined in errmsg.h
* (CDECL__Exxx).
set_err(msg, &state->err);
}
+/*
+ * In the NLS-disabled case, all format strings are of the form
+ *
+ * "blah blah %s"
+ *
+ * so we exploit this to implement a simple snprintf workalike using the
+ * libcdecl output helpers directly.
+ *
+ * In the NLS-enabled case, we have to use snprintf as format strings may
+ * be translated. GNU libintl ensures a suitable version is available.
+ */
+static size_t
+fmt_err(struct err_state *state, const char *fmt, const char *arg)
+{
+#if ENABLE_NLS
+ snprintf(state->str, state->nstr, fmt, arg);
+ return strlen(fmt) + strlen(arg);
+#else
+ struct output_state dst = { state->str, state->nstr };
+ size_t rc;
+
+ rc = cdecl__strlcpy(dst.dst, fmt, dst.dstlen);
+ cdecl__advance(&dst, rc-2);
+ cdecl__emit(&dst, arg);
+
+ return dst.accum;
+#endif
+}
+
/*
* 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)
+void cdecl__err(const char *fmt, const char *arg)
{
struct err_state *state;
- int rc, try = 0;
+ unsigned try = 0;
+ size_t rc;
state = get_err_state();
if (!state)
return;
retry:
- rc = snprintf(state->str, state->nstr, fmt, arg);
- if (rc > 0 && rc >= state->nstr) {
- assert(try++ == 0 && rc < SIZE_MAX / 4);
+ rc = fmt_err(state, fmt, arg);
+ if (rc >= state->nstr) {
+ assert(try++ == 0 && rc < (size_t)-1 / 4);
+
state = alloc_err_state(state, (size_t)(rc+1u) * 3 / 2);
if (!state)
return;
goto retry;
}
+ state->err.code = CDECL_ENOPARSE;
state->err.str = state->str;
- state->err.code = code;
}
const struct cdecl_error *cdecl_get_error(void)