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
@@ -807,21 +807,31 @@ wordsplit_finish (struct wordsplit *wsp)
 
-  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;
     }
@@ -2414,2 +2424,3 @@ wordsplit_process_list (struct wordsplit *wsp, size_t start)
     }
+
   return wsp->ws_errno;
diff --git a/tests/wordsplit.at b/tests/wordsplit.at
index 631d939..e3af703 100644
--- a/tests/wordsplit.at
+++ b/tests/wordsplit.at
@@ -264,3 +264,3 @@ TOTAL: 2
 
-TESTWSP([nosplit with expansion],[wsp-var-nosplit],[nosplit],
+TESTWSP([nosplit with variable expansion],[wsp-var-nosplit],[nosplit],
 [a $FOO test],
@@ -273,3 +273,3 @@ TOTAL: 1
 
-TESTWSP([nosplit without expansion],[],[nosplit novar],
+TESTWSP([nosplit without variable expansion],[],[nosplit novar],
 [a $FOO test],
@@ -282,2 +282,11 @@ TOTAL: 1
 
+TESTWSP([nosplit: empty expansion],[],[nosplit trimnl],
+[$FOO],
+[NF: 1
+0: ""
+TOTAL: 1
+],
+[],
+[FOO=""])
+
 TESTWSP([default value (defined)],[],[],