Module: wine Branch: master Commit: 3a25888f38dbfed5d80368aaea4c2bd4f601dc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a25888f38dbfed5d80368aaea...
Author: Jason Edmeades us@edmeades.me.uk Date: Sun Sep 2 22:08:57 2012 +0100
cmd: for loops did not respect boundaries.
---
programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++------ programs/cmd/tests/test_builtins.cmd.exp | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ebb1c80..e28ff10 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1364,7 +1364,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("FOR /L provided range from %d to %d step %d\n", numbers[0], numbers[2], numbers[1]); for (i=numbers[0]; - (numbers[1]<0)? i>numbers[2] : i<numbers[2]; + (numbers[1]<0)? i>=numbers[2] : i<=numbers[2]; i=i + numbers[1]) {
sprintfW(thisNum, fmt, i); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 6295f9e..4856578 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -673,12 +673,18 @@ for /L %%i in (1,2,a) do echo %%i echo ErrorLevel %ErrorLevel% for /L %%i in (1,a,b) do echo %%i echo ErrorLevel %ErrorLevel% -rem FIXME: following test cases cannot be currently tested due to an inconsistent/buggy 'for /L' parsing. -rem for /L %%i in (a,2,b) do echo %%i -rem for /L %%i in (1,1,1) do echo %%i -rem for /L %%i in (1,-2,-1) do echo %%i -rem for /L %%i in (-1,-1,-1) do echo %%i -rem for /L %%i in (1,2, 3) do echo %%i +rem Test boundaries +for /l %%i in (1,1,4) do echo %%i +for /l %%i in (1,2,4) do echo %%i +for /l %%i in (4,-1,1) do echo %%i +for /l %%i in (4,-2,1) do echo %%i +for /l %%i in (1,-1,4) do echo %%i +for /l %%i in (4,1,1) do echo %%i +for /L %%i in (a,2,b) do echo %%i +for /L %%i in (1,1,1) do echo %%i +for /L %%i in (1,-2,-1) do echo %%i +for /L %%i in (-1,-1,-1) do echo %%i +for /L %%i in (1,2, 3) do echo %%i echo --- for /a rem No output when using "set expr" syntax, unless in interactive mode rem Need to use "set envvar=expr" to use in a batch script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index bb75515..0011d35 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -471,6 +471,25 @@ bar -1 @todo_wine@ErrorLevel 0 @todo_wine@ErrorLevel 0 +1 +2 +3 +4 +1 +3 +4 +3 +2 +1 +4 +2 +0 +1 +1 +-1 +-1 +1 +3 --- for /a ------ individual operations 0