aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-05-15 16:37:09 +0300
committerSergey Poznyakoff <gray@gnu.org>2019-05-15 16:37:09 +0300
commit20899f652a904b510b2c7d3507b75d1399416485 (patch)
tree44f221b132d16f229fb991a03451d7039fb5f726 /src
parent7dbea4b03426d8a81dbc6563b96aa760e719f5a8 (diff)
downloadgrecs-20899f652a904b510b2c7d3507b75d1399416485.tar.gz
grecs-20899f652a904b510b2c7d3507b75d1399416485.tar.bz2
wordsplit: introduce error context
* include/wordsplit.h (wordsplit) <ws_errctx>: New field. * src/wordsplit.c (wordsplit_init): Initialize ws_errctx. (expvar,wordsplit_pathexpand): Save error context. (wordsplit_clearerr): Free error context. (wordsplit_perror): Use error context if available. * tests/wordsplit.at: Reflect changes.
Diffstat (limited to 'src')
-rw-r--r--src/wordsplit.c38
1 files changed, 36 insertions, 2 deletions
diff --git a/src/wordsplit.c b/src/wordsplit.c
index af747b3..6dba914 100644
--- a/src/wordsplit.c
+++ b/src/wordsplit.c
@@ -109,2 +109,26 @@ _wsplt_nomem (struct wordsplit *wsp)
+static void
+_wsplt_store_errctx (struct wordsplit *wsp, char const *str, size_t len)
+{
+ free (wsp->ws_errctx);
+ wsp->ws_errctx = malloc (len + 1);
+ if (!wsp->ws_errctx)
+ {
+ wsp->ws_error ("%s",
+ _("memory exhausted while trying to store error subject"));
+ }
+ else
+ {
+ memcpy (wsp->ws_errctx, str, len);
+ wsp->ws_errctx[len] = 0;
+ }
+}
+
+static inline int
+_wsplt_setctxerr (struct wordsplit *wsp, int ec, char const *str, size_t len)
+{
+ _wsplt_store_errctx (wsp, str, len);
+ return _wsplt_seterr (wsp, ec);
+}
+
static int wordsplit_run (const char *command, size_t length,
@@ -309,2 +333,4 @@ wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
+ wsp->ws_errctx = NULL;
+
wordsplit_init0 (wsp);
@@ -1577,3 +1603,3 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
{
- _wsplt_seterr (wsp, WRDSE_UNDEF);
+ _wsplt_setctxerr (wsp, WRDSE_UNDEF, str, *pend - str + 1);
return 1;
@@ -2100,3 +2126,3 @@ wordsplit_pathexpand (struct wordsplit *wsp)
free (pattern);
- return _wsplt_seterr (wsp, WRDSE_GLOBERR);
+ return _wsplt_setctxerr (wsp, WRDSE_GLOBERR, pattern, slen);
}
@@ -2756,2 +2782,6 @@ wordsplit_clearerr (struct wordsplit *ws)
ws->ws_usererr = NULL;
+
+ free (ws->ws_errctx);
+ ws->ws_errctx = NULL;
+
ws->ws_errno = WRDSE_OK;
@@ -2762,2 +2792,3 @@ wordsplit_free (struct wordsplit *ws)
{
+ wordsplit_clearerr (ws);
wordsplit_free_nodes (ws);
@@ -2825,2 +2856,5 @@ wordsplit_perror (struct wordsplit *wsp)
default:
+ if (wsp->ws_errctx)
+ wsp->ws_error ("%s: %s", wordsplit_strerror (wsp), wsp->ws_errctx);
+ else
wsp->ws_error ("%s", wordsplit_strerror (wsp));

Return to:

Send suggestions and report system problems to the System administrator.