[PATCH 3/3] cmd: Handle lines terminated with caret followed by EOF

[Alexander Merkle]

From: Alexander Merkle

---
 programs/cmd/tests/rsrc.rc                | 6 ++++++
 programs/cmd/tests/test_caret_eof.cmd     | 3 +++
 programs/cmd/tests/test_caret_eof.cmd.exp | 3 +++
 programs/cmd/wcmdmain.c                   | 6 ++++++
 4 files changed, 18 insertions(+)
 create mode 100644 programs/cmd/tests/test_caret_eof.cmd
 create mode 100644 programs/cmd/tests/test_caret_eof.cmd.exp

diff --git a/programs/cmd/tests/rsrc.rc b/programs/cmd/tests/rsrc.rc
index ca45543cfa4..382e297c468 100644
--- a/programs/cmd/tests/rsrc.rc
+++ b/programs/cmd/tests/rsrc.rc
@@ -34,6 +34,12 @@ test_block_if_eof2.cmd TESTCMD "test_block_if_eof2.cmd"
 /* @makedep: test_block_if_eof2.cmd.exp */
 test_block_if_eof2.cmd.exp TESTOUT "test_block_if_eof2.cmd.exp"

+/* @makedep: test_caret_eof.cmd */
+test_caret_eof.cmd TESTCMD "test_caret_eof.cmd"
+
+/* @makedep: test_caret_eof.cmd.exp */
+test_caret_eof.cmd.exp TESTOUT "test_caret_eof.cmd.exp"
+
 /* @makedep: test_cmdline.cmd */
 test_cmdline.cmd TESTCMD "test_cmdline.cmd"

diff --git a/programs/cmd/tests/test_caret_eof.cmd b/programs/cmd/tests/test_caret_eof.cmd
new file mode 100644
index 00000000000..d0157171925
--- /dev/null
+++ b/programs/cmd/tests/test_caret_eof.cmd
@@ -0,0 +1,3 @@
+@echo off
+echo Test caret followed by EOF
+echo foo^
diff --git a/programs/cmd/tests/test_caret_eof.cmd.exp b/programs/cmd/tests/test_caret_eof.cmd.exp
new file mode 100644
index 00000000000..9c99c033e6b
--- /dev/null
+++ b/programs/cmd/tests/test_caret_eof.cmd.exp
@@ -0,0 +1,3 @@
+Test caret followed by EOF
+foo
+
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 453da83aa2a..2a12014fcde 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -2330,6 +2330,12 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE
           if (!context) WCMD_output_asis( WCMD_LoadMessage(WCMD_MOREPROMPT));
           if (!WCMD_fgets(extraData, MAXSTRING, readFrom)) {
             /* EOF in parentheses - abort don't execute block */
+            /* caret followed by EOF - execute line */
+            if (lastWasCaret && (curDepth == 0) && (*extraSpace == 0x00)) {
+              *extraData++ = '\r';
+              *extraData = 0x00;
+              break;
+            }
             return NULL;
           }