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

svn path=/trunk/; revision=18962
This commit is contained in:
Hartmut Birr 2005-11-02 23:47:58 +00:00
parent 8bbbecaa87
commit a5ad40f6c0

View file

@ -1282,6 +1282,7 @@ ProcessInput (BOOL bFlag)
LPCTSTR tmp; LPCTSTR tmp;
BOOL bEchoThisLine; BOOL bEchoThisLine;
BOOL bModeSetA; BOOL bModeSetA;
BOOL bIsBatch;
do do
{ {
@ -1294,7 +1295,12 @@ ProcessInput (BOOL bFlag)
ReadCommand (readline, CMDLINE_LENGTH); ReadCommand (readline, CMDLINE_LENGTH);
ip = readline; ip = readline;
bEchoThisLine = FALSE; bEchoThisLine = FALSE;
bIsBatch = FALSE;
} }
else
{
bIsBatch = TRUE;
}
/* skip leading blanks */ /* skip leading blanks */
while ( _istspace(*ip) ) while ( _istspace(*ip) )
@ -1403,7 +1409,7 @@ ProcessInput (BOOL bFlag)
if (*commandline) if (*commandline)
{ {
ParseCommandLine (commandline); ParseCommandLine (commandline);
if (bEcho && !bIgnoreEcho) if (bEcho && !bIgnoreEcho && (!bIsBatch || bEchoThisLine))
ConOutChar ('\n'); ConOutChar ('\n');
bIgnoreEcho = FALSE; bIgnoreEcho = FALSE;
} }