Change prototypes of ws_getvar and ws_command.

New invocation sequence ensures proper error handling.
This is an incompatible change.  Authors using ws_getvar member will
have to rewrite their ws_getvar function accordingly.

* src/wordsplit.c (wordsplit_init0): Call wordsplit_clearerr
on reuse.
(wordsplit_init): Fix ws_errno
(expvar): Change invocation of ws_getvar.
(expcmd): Change invocation of ws_command.
(wordsplit_clearerr): New function.
(wordsplit_strerror): Handle WRDSE_USERERR.
* src/wordsplit.h (ws_getvar): Change return value and signature of
ws_getvar and ws_command.
New member 'ws_usererr'.
(WRDSF_ARGV): New flag.
(WRDSE_OK): New define. Same as WRDSE_EOF.
(WRDSE_USERERR): New error code.
(wordsplit_clearerr): New proto.
* tests/wsp.c (wsp_getvar, wsp_runcmd): Rewrite.

1 files changed, 63 insertions, 4 deletions

diff --git a/src/wordsplit.c b/src/wordsplit.c
index f17ed98..2b99b42 100644
--- a/src/wordsplit.c
+++ b/src/wordsplit.c
@@ -96,6 +96,7 @@ wordsplit_init0 (struct wordsplit *wsp)
     {
       if (!(wsp->ws_flags & WRDSF_APPEND))
 	wordsplit_free_words (wsp);
+      wordsplit_clearerr (wsp);
     }
   else
     {
@@ -134,7 +135,7 @@ wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
       if (!wsp->ws_command)
 	{
 	  errno = EINVAL;
-	  wsp->ws_errno = WRDSE_NOSUPP;
+	  wsp->ws_errno = WRDSE_USAGE;
 	  if (wsp->ws_flags & WRDSF_SHOWERR)
 	    wordsplit_perror (wsp);
 	  return wsp->ws_errno;
@@ -786,7 +787,30 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
 	return _wsplt_nomem (wsp);
     }
   else if (wsp->ws_flags & WRDSF_GETVAR)
-    value = wsp->ws_getvar (str, i, wsp->ws_closure);
+    {
+      int rc = wsp->ws_getvar (&value, str, i, wsp->ws_closure);
+      switch (rc)
+	{
+	case WRDSE_OK:
+	  break;
+
+	case WRDSE_NOSPACE:
+	  return _wsplt_nomem (wsp);
+
+	case WRDSE_UNDEF:
+	  value = NULL;
+	  break;
+
+	case WRDSE_USERERR:
+	  wsp->ws_usererr = value;
+	  /* fall through */
+	default:
+	  wsp->ws_errno = rc;
+ 	  if (wsp->ws_flags & WRDSF_SHOWERR)
+	    wordsplit_perror (wsp);
+	  return 1;
+	}
+    }
   else
     value = NULL;
   
@@ -818,7 +842,7 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
       else if (wsp->ws_flags & WRDSF_UNDEF)
 	{
 	  wsp->ws_errno = WRDSE_UNDEF;
-	  if (wsp->ws_flags & WRDSF_SHOWERR)
+ 	  if (wsp->ws_flags & WRDSF_SHOWERR)
 	    wordsplit_perror (wsp);
 	  return 1;
 	}
@@ -1033,6 +1057,7 @@ static int
 expcmd (struct wordsplit *wsp, const char *str, size_t len,
 	struct wordsplit_node **ptail, const char **pend, int flg)
 {
+  int rc;
   size_t j;
   char *value;
   struct wordsplit_node *newnode;
@@ -1047,7 +1072,30 @@ expcmd (struct wordsplit *wsp, const char *str, size_t len,
     }
 
   *pend = str + j;
-  value = wsp->ws_command (str, j, wsp);
+  if (wsp->ws_flags & WRDSF_ARGV)
+    {
+      struct wordsplit ws;
+
+      ws.ws_delim = wsp->ws_delim;
+      rc = wordsplit_len (str, j, &ws,
+			  WRDSF_NOVAR | WRDSF_NOCMD | WRDSF_DELIM |
+			  (wsp->ws_flags & (WRDSF_WS | WRDSF_QUOTE)));
+      rc = wsp->ws_command (&value, str, j, ws.ws_wordv, wsp->ws_closure);
+    }
+  else
+    rc = wsp->ws_command (&value, str, j, NULL, wsp->ws_closure);
+  
+  if (rc == WRDSE_NOSPACE)
+    return _wsplt_nomem (wsp);
+  else if (rc)
+    {
+      if (rc == WRDSE_USERERR)
+	wsp->ws_usererr = value;
+      wsp->ws_errno = rc;
+      if (wsp->ws_flags & WRDSF_SHOWERR)
+	wordsplit_perror (wsp);
+      return 1;
+    }
 
   if (value)
     {
@@ -1752,6 +1800,15 @@ wordsplit_free_words (struct wordsplit *ws)
 }
 
 void
+wordsplit_clearerr (struct wordsplit *ws)
+{
+  if (ws->ws_errno == WRDSE_USERERR)
+    free (ws->ws_usererr);
+  ws->ws_usererr = NULL;
+  ws->ws_errno = WRDSE_OK;
+}
+
+void
 wordsplit_free (struct wordsplit *ws)
 {
   wordsplit_free_words (ws);
@@ -1819,6 +1876,8 @@ int _wordsplit_nerrs =
 const char *
 wordsplit_strerror (struct wordsplit *ws)
 {
+  if (ws->ws_errno == WRDSE_USERERR)
+    return ws->ws_usererr;
   if (ws->ws_errno < _wordsplit_nerrs)
     return _wordsplit_errstr[ws->ws_errno];
   return N_("unknown error");