cmd: Add a space at the end of the first echo'ed batch line [try2]

[Alexandre Goujon]

---
 programs/cmd/tests/test_builtins.cmd     |   17 ++++++++++++++-
 programs/cmd/tests/test_builtins.cmd.exp |   32 ++++++++++++++++++++++++++++-
 programs/cmd/wcmdmain.c                  |    3 ++
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index d9f5cf7..0d3e46f 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -1,7 +1,20 @@
 echo Tests for cmd's builtin commands
- at echo off
 
-echo ------------ Testing 'echo' --------------
+ at echo on
+echo ------------ Testing 'echo' [ON] --------------
+echo word
+echo 'singlequotedword'
+echo "doublequotedword"
+ at echo at-echoed-word
+echo "/?"
+echo.
+echo .
+echo.word
+echo .word
+
+
+ at echo off
+echo ------------ Testing 'echo' [OFF] --------------
 echo word
 echo 'singlequotedword'
 echo "doublequotedword"
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 8942cb3..129d6ec 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -1,7 +1,35 @@
 
- at pwd@>echo Tests for cmd's builtin commands at todo_space@
+ at pwd@>echo Tests for cmd's builtin commands 
 Tests for cmd's builtin commands
------------- Testing 'echo' --------------
+
+ at pwd@>echo ------------ Testing 'echo' [ON] -------------- 
+------------ Testing 'echo' [ON] --------------
+
+ at pwd@>echo word 
+word
+
+ at pwd@>echo 'singlequotedword' 
+'singlequotedword'
+
+ at pwd@>echo "doublequotedword" 
+"doublequotedword"
+at-echoed-word
+
+ at pwd@>echo "/?" 
+"/?"
+
+ at pwd@>echo.
+
+
+ at pwd@>echo . 
+.
+
+ at pwd@>echo.word
+word
+
+ at pwd@>echo .word 
+.word
+------------ Testing 'echo' [OFF] --------------
 word
 'singlequotedword'
 "doublequotedword"
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index b50512e..85f78b8 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1779,8 +1779,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF
     if (context) handleExpansion(extraSpace, FALSE, NULL, NULL);
     /* Show prompt before batch line IF echo is on and in batch program */
     if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) {
+      const WCHAR spc[]={' ','\0'};
       WCMD_show_prompt();
       WCMD_output_asis(extraSpace);
+      /* I don't know why Windows puts a space here but it does */
+      WCMD_output_asis(spc);
       WCMD_output_asis(newline);
     }
 
-- 
1.7.0.4