Jason Edmeades : cmd: A successful set should reset the errorlevel.
Alexandre Julliard
julliard at winehq.org
Thu Sep 6 13:37:23 CDT 2012
Module: wine
Branch: master
Commit: f9b4c78a8981df2b8aa81b0a2d32bc8e828c9ca3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b4c78a8981df2b8aa81b0a2d32bc8e828c9ca3
Author: Jason Edmeades <jason at edmeades.me.uk>
Date: Wed Sep 5 23:41:48 2012 +0100
cmd: A successful set should reset the errorlevel.
---
programs/cmd/builtins.c | 1 +
programs/cmd/tests/test_builtins.cmd.exp | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index b2f9aeb..a9e7473 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -2366,6 +2366,7 @@ void WCMD_setshow_env (WCHAR *s) {
if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) {
errorlevel = 1;
} else if ((!status)) WCMD_print_error();
+ else errorlevel = 0;
}
}
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index fe4c30c..6a19d2c 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -201,13 +201,13 @@ baz at space@
@todo_wine at 0
------------ Testing 'set' ------------
1
- at todo_wine@0
+0
FOOBAR not defined
@todo_wine@ baz
FOOBAR = baz
- at todo_wine@0
+0
@todo_wine@ baz2
- at todo_wine@0
+0
bar
@todo_wine at FOOBAR= bar
@todo_wine at FOOBAR = baz2
More information about the wine-cvs
mailing list