Module: wine Branch: master Commit: c5a72379a1fd8b61e649ff3c45225b7111ec1249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a72379a1fd8b61e649ff3c45...
Author: Jason Edmeades jason@edmeades.me.uk Date: Mon Sep 3 22:48:08 2012 +0100
cmd: Fix renaming inside directories.
---
programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c92822b..16f4eff 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1872,7 +1872,7 @@ void WCMD_rename (void) }
/* Destination cannot contain a drive letter or directory separator */ - if ((strchrW(param1,':') != NULL) || (strchrW(param1,'\') != NULL)) { + if ((strchrW(param2,':') != NULL) || (strchrW(param2,'\') != NULL)) { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); errorlevel = 1; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c444be6..b7bcd96 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -629,8 +629,8 @@ read-only file renamed dir renamed read-only dir renamed --- rename in other directory -@todo_wine@rename impossible in other directory -@todo_wine@original file still present +rename impossible in other directory +original file still present ------------ Testing move ------------ --- file move file move succeeded