Don't print a CR, if the command line is from a batch file and starts with a '@'.

svn path=/trunk/; revision=18962

diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c
index 59878c2..bc7c05e 100644 (file)
--- a/reactos/subsys/system/cmd/cmd.c
+++ b/reactos/subsys/system/cmd/cmd.c
@@ -1282,6 +1282,7 @@ ProcessInput (BOOL bFlag)
        LPCTSTR tmp;
        BOOL bEchoThisLine;
        BOOL bModeSetA;
+        BOOL bIsBatch;
 
        do
        {
@@ -1294,7 +1295,12 @@ ProcessInput (BOOL bFlag)
                        ReadCommand (readline, CMDLINE_LENGTH);
                        ip = readline;
                        bEchoThisLine = FALSE;
+                        bIsBatch = FALSE;
                }
+                else
+                {
+                        bIsBatch = TRUE;
+                }
 
                /* skip leading blanks */
                while ( _istspace(*ip) )
@@ -1403,7 +1409,7 @@ ProcessInput (BOOL bFlag)
                if (*commandline)
                {
                        ParseCommandLine (commandline);
-                       if (bEcho && !bIgnoreEcho)
+                       if (bEcho && !bIgnoreEcho && (!bIsBatch || bEchoThisLine))
                                ConOutChar ('\n');
                        bIgnoreEcho = FALSE;
                }