From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/cmd/builtins.c | 4 +++- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d3dede6b9f5..c8c4dfbaa0b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3321,7 +3321,8 @@ RETURN_CODE WCMD_setshow_path(const WCHAR *args) * Set or show the command prompt. */
-void WCMD_setshow_prompt (void) { +RETURN_CODE WCMD_setshow_prompt(void) +{
WCHAR *s;
@@ -3336,6 +3337,7 @@ void WCMD_setshow_prompt (void) { } else SetEnvironmentVariableW(L"PROMPT", s); } + return errorlevel = NO_ERROR; }
/**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0d0bbb95e15..de82728369a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -597,7 +597,7 @@ FAILURE 1 FAILURE 1 SUCCESS 0 --- success/failure for PROMPT command -@todo_wine@SUCCESS 0 +SUCCESS 0 --- ------------ Testing 'set' ------------ 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 1eae5701b8b..f225ad0b9ff 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -200,7 +200,7 @@ RETURN_CODE WCMD_setshow_date(void); RETURN_CODE WCMD_setshow_default(const WCHAR *args); RETURN_CODE WCMD_setshow_env(WCHAR *command); RETURN_CODE WCMD_setshow_path(const WCHAR *args); -void WCMD_setshow_prompt (void); +RETURN_CODE WCMD_setshow_prompt(void); RETURN_CODE WCMD_setshow_time(void); RETURN_CODE WCMD_shift(const WCHAR *args); void WCMD_start (WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d83da05cb30..ed520a05ed6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1864,7 +1864,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_pause (); break; case WCMD_PROMPT: - WCMD_setshow_prompt (); + return_code = WCMD_setshow_prompt(); break; case WCMD_REM: break;