ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd: Fix handling of lines starting with echo. or echo:.

This commit is contained in:
Frédéric Delanoy 2011-08-05 16:29:21 +02:00 committed by Alexandre Julliard
parent 9ad60d1d14
commit 71a237d478
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/cmd/tests/test_builtins.cmd.exp
View File

@ -18,25 +18,25 @@ at-echoed-word
@pwd@>echo "/?"@space@ @pwd@>echo "/?"@space@
"/?" "/?"
@todo_wine@@pwd@>echo. @pwd@>echo.
@pwd@>echo .@space@ @pwd@>echo .@space@
. .
@todo_wine@@pwd@>echo.word @pwd@>echo.word
word word
@pwd@>echo .word@space@ @pwd@>echo .word@space@
.word .word
@todo_wine@@pwd@>echo: @pwd@>echo:
@pwd@>echo :@space@ @pwd@>echo :@space@
: :
@todo_wine@@pwd@>echo:word @pwd@>echo:word
word word
@pwd@>echo :word@space@ @pwd@>echo :word@space@

12
programs/cmd/wcmdmain.c
View File

@ -1786,10 +1786,22 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF
/* Show prompt before batch line IF echo is on and in batch program */ /* Show prompt before batch line IF echo is on and in batch program */
if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) {
const WCHAR spc[]={' ','\0'}; const WCHAR spc[]={' ','\0'};
const WCHAR echoDot[] = {'e','c','h','o','.'};
const WCHAR echoCol[] = {'e','c','h','o',':'};
const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]);
DWORD curr_size = strlenW(extraSpace);
DWORD min_len = (curr_size < len ? curr_size : len);
WCMD_show_prompt(); WCMD_show_prompt();
WCMD_output_asis(extraSpace); WCMD_output_asis(extraSpace);
/* I don't know why Windows puts a space here but it does */ /* I don't know why Windows puts a space here but it does */
/* Except for lines starting with 'echo.' or 'echo:'. Ask MS why */
if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE,
extraSpace, min_len, echoDot, len) != CSTR_EQUAL
&& CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE,
extraSpace, min_len, echoCol, len) != CSTR_EQUAL)
{
WCMD_output_asis(spc); WCMD_output_asis(spc);
}
WCMD_output_asis(newline); WCMD_output_asis(newline);
} }