wordsplit: return single empty string on empty input in WRDSF_NOSPLIT mode

* src/wordsplit.c (wordsplit_finish): Make sure at one non-null
argument is always returned in WRDSF_NOSPLIT mode.
* tests/wordsplit.at: Add new test.

2 files changed, 36 insertions, 16 deletions

diff --git a/src/wordsplit.c b/src/wordsplit.c
index f94015a..e979f27 100644
--- a/src/wordsplit.c
+++ b/src/wordsplit.c
@@ -796,43 +796,53 @@ wordsplit_finish (struct wordsplit *wsp)
     }
 
   if (p)
     {
       /* We're here if WRDSO_MAXWORDS is in effect and wsp->ws_maxwords
 	 words have already been collected. Reconstruct a single final
 	 node from the remaining nodes. */
       if (wsnode_tail_coalesce (wsp, p))
 	return wsp->ws_errno;
       n++;
     }
 
-  if (n == 0 && (wsp->ws_flags & WRDSF_INCREMENTAL))
+  if (n == 0)
     {
-      /* The loop above have eliminated all nodes. Restart the
-	 processing, if there's any input left. */
-      if (wsp->ws_endp < wsp->ws_len)
+      /* The loop above have eliminated all nodes. */
+      if (wsp->ws_flags & WRDSF_INCREMENTAL)
 	{
-	  int rc;
-	  if (wsp->ws_flags & WRDSF_SHOWDBG)
-	    wsp->ws_debug (_("Restarting"));
-	  rc = wordsplit_process_list (wsp, skip_delim (wsp));
-	  if (rc)
-	    return rc;
+	  /* Restart the processing, if there's any input left. */
+	  if (wsp->ws_endp < wsp->ws_len)
+	    {
+	      int rc;
+	      if (wsp->ws_flags & WRDSF_SHOWDBG)
+		wsp->ws_debug (_("Restarting"));
+	      rc = wordsplit_process_list (wsp, skip_delim (wsp));
+	      if (rc)
+		return rc;
+	    }
+	  else
+	    {
+	      wsp->ws_error = WRDSE_EOF;
+	      return WRDSE_EOF;
+	    }
+	  goto again;
 	}
-      else
+
+      if (wsp->ws_flags & WRDSF_NOSPLIT)
 	{
-	  wsp->ws_error = WRDSE_EOF;
-	  return WRDSE_EOF;
+	  if (wordsplit_add_segm (wsp, 0, 0, _WSNF_EMPTYOK))
+	    return wsp->ws_errno;
+	  n = 1;
 	}
-      goto again;
     }
 
   if (alloc_space (wsp, n + 1))
     return wsp->ws_errno;
 
   while (wsp->ws_head)
     {
       const char *str = wsnode_ptr (wsp, wsp->ws_head);
       size_t slen = wsnode_len (wsp->ws_head);
       char *newstr = malloc (slen + 1);
 
       /* Assign newstr first, even if it is NULL.  This way
@@ -2403,24 +2413,25 @@ wordsplit_process_list (struct wordsplit *wsp, size_t start)
 	  if (p->expansion)
 	    {
 	      if (p->expansion (wsp))
 		break;
 	      if (wsp->ws_flags & WRDSF_SHOWDBG)
 		{
 		  wsp->ws_debug ("(%02d) %s", wsp->ws_lvl, _(p->descr));
 		  wordsplit_dump_nodes (wsp);
 		}
 	    }
 	}
     }
+
   return wsp->ws_errno;
 }
 
 static int
 wordsplit_run (const char *command, size_t length, struct wordsplit *wsp,
                int flags, int lvl)
 {
   int rc;
   size_t start;
 
   if (!command)
     {
diff --git a/tests/wordsplit.at b/tests/wordsplit.at
index 631d939..e3af703 100644
--- a/tests/wordsplit.at
+++ b/tests/wordsplit.at
@@ -253,42 +253,51 @@ TOTAL: 1
 
 TESTWSP([K/V environment],[wsp-env-kv wsp-env_kv],
 [env_kv],
 [$FOO a$BAZ],
 [NF: 2
 0: bar
 1: aqux
 TOTAL: 2
 ],
 [],
 [FOO=bar BAZ=qux])
 
-TESTWSP([nosplit with expansion],[wsp-var-nosplit],[nosplit],
+TESTWSP([nosplit with variable expansion],[wsp-var-nosplit],[nosplit],
 [a $FOO test],
 [NF: 1
 0: "a variable expansion test\n"
 TOTAL: 1
 ],
 [],
 [FOO="variable expansion"])
 
-TESTWSP([nosplit without expansion],[],[nosplit novar],
+TESTWSP([nosplit without variable expansion],[],[nosplit novar],
 [a $FOO test],
 [NF: 1
 0: "a $FOO test\n"
 TOTAL: 1
 ],
 [],
 [FOO="variable expansion"])
 
+TESTWSP([nosplit: empty expansion],[],[nosplit trimnl],
+[$FOO],
+[NF: 1
+0: ""
+TOTAL: 1
+],
+[],
+[FOO=""])
+
 TESTWSP([default value (defined)],[],[],
 [${FOO:-bar}],
 [NF: 1
 0: qux
 TOTAL: 1
 ],
 [],
 [FOO=qux])
 
 TESTWSP([default value],[],[],
 [${FOO:-bar}],
 [NF: 1