From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/cmd/builtins.c | 8 ++++---- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ac26896f0a8..a509f68382a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1474,7 +1474,6 @@ RETURN_CODE WCMD_delete(WCHAR *args) argsProcessed = TRUE; if (!WCMD_delete_one(thisArg)) { - WCMD_output_stderr(WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); errorlevel = ERROR_INVALID_FUNCTION; } } @@ -3374,7 +3373,8 @@ RETURN_CODE WCMD_setshow_time(void) * Optional /n says where to start shifting (n=0-8) */
-void WCMD_shift (const WCHAR *args) { +RETURN_CODE WCMD_shift(const WCHAR *args) +{ int start;
if (context != NULL) { @@ -3388,7 +3388,7 @@ void WCMD_shift (const WCHAR *args) { } else { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); - return; + return errorlevel = ERROR_INVALID_FUNCTION; }
WINE_TRACE("Shifting variables, starting at %d\n", start); @@ -3397,7 +3397,7 @@ void WCMD_shift (const WCHAR *args) { } context -> shift_count[9] = context -> shift_count[9] + 1; } - + return NO_ERROR; }
/**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0cff90d83be..8804bd48c4b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -589,7 +589,7 @@ SUCCESS 0 FAILURE 2 FAILURE 2 --- success/failure for SHIFT command -@todo_wine@FAILURE 1 +FAILURE 1 SUCCESS 666 SUCCESS 666 --- success/failure for HELP command diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 79ef2bb65a7..192680eac42 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -202,7 +202,7 @@ RETURN_CODE WCMD_setshow_env(WCHAR *command); RETURN_CODE WCMD_setshow_path(const WCHAR *args); void WCMD_setshow_prompt (void); RETURN_CODE WCMD_setshow_time(void); -void WCMD_shift (const WCHAR *args); +RETURN_CODE WCMD_shift(const WCHAR *args); void WCMD_start (WCHAR *args); void WCMD_title (const WCHAR *); RETURN_CODE WCMD_type(WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 6212dacf7e7..a9704a80fb2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1887,7 +1887,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_setshow_env(parms_start); break; case WCMD_SHIFT: - WCMD_shift (parms_start); + return_code = WCMD_shift(parms_start); break; case WCMD_START: WCMD_start (parms_start);