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

cmd: Partial fix for echo's special ':' handling.

This commit is contained in:
Frédéric Delanoy 2011-07-28 01:06:47 +02:00 committed by Alexandre Julliard
parent dcd544f744
commit 25fcad3768
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/cmd/builtins.c
View File

@ -861,10 +861,10 @@ void WCMD_echo (const WCHAR *command) {
int count; int count;
const WCHAR *origcommand = command; const WCHAR *origcommand = command;
if (command[0]==' ' || command[0]=='.') if (command[0]==' ' || command[0]=='.' || command[0]==':')
command++; command++;
count = strlenW(command); count = strlenW(command);
if (count == 0 && origcommand[0]!='.') { if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':') {
if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW);
else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW);
return; return;

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

@ -31,13 +31,13 @@ word
.word .word
@todo_wine@@pwd@>echo: @todo_wine@@pwd@>echo:
@todo_wine@
@pwd@>echo :@space@ @pwd@>echo :@space@
: :
@todo_wine@@pwd@>echo:word @todo_wine@@pwd@>echo:word
@todo_wine@word word
@pwd@>echo :word@space@ @pwd@>echo :word@space@
:word :word
@ -57,9 +57,9 @@ at-echoed-word
. .
word word
.word .word
@todo_wine@
: :
@todo_wine@word word
:word :word
word@space@ word@space@
word@space@@space@ word@space@@space@