Don't print a CR, if the command line is from a batch file and starts
with a '@'.
Modified: trunk/reactos/subsys/system/cmd/cmd.c
_____
Modified: trunk/reactos/subsys/system/cmd/cmd.c
--- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-02 23:24:05 UTC
(rev 18961)
+++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-02 23:47:58 UTC
(rev 18962)
@@ -1282,6 +1282,7 @@
LPCTSTR tmp;
BOOL bEchoThisLine;
BOOL bModeSetA;
+ BOOL bIsBatch;
do
{
@@ -1294,7 +1295,12 @@
ReadCommand (readline, CMDLINE_LENGTH);
ip = readline;
bEchoThisLine = FALSE;
+ bIsBatch = FALSE;
}
+ else
+ {
+ bIsBatch = TRUE;
+ }
/* skip leading blanks */
while ( _istspace(*ip) )
@@ -1403,7 +1409,7 @@
if (*commandline)
{
ParseCommandLine (commandline);
- if (bEcho && !bIgnoreEcho)
+ if (bEcho && !bIgnoreEcho && (!bIsBatch ||
bEchoThisLine))
ConOutChar ('\n');
bIgnoreEcho = FALSE;
}