From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/cmd/builtins.c | 7 ++++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5a53af28ebe..708e3c6dce6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1506,7 +1506,7 @@ static WCHAR *WCMD_strtrim(const WCHAR *s) * in DOS (try typing "ECHO ON AGAIN" for an example). */
-void WCMD_echo (const WCHAR *args) +RETURN_CODE WCMD_echo(const WCHAR *args) { int count; const WCHAR *origcommand = args; @@ -1517,7 +1517,7 @@ void WCMD_echo (const WCHAR *args) args++;
trimmed = WCMD_strtrim(args); - if (!trimmed) return; + if (!trimmed) return NO_ERROR;
count = lstrlenW(trimmed); if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':' @@ -1525,7 +1525,7 @@ void WCMD_echo (const WCHAR *args) if (echo_mode) WCMD_output(WCMD_LoadMessage(WCMD_ECHOPROMPT), L"ON"); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), L"OFF"); free(trimmed); - return; + return NO_ERROR; }
if (lstrcmpiW(trimmed, L"ON") == 0) @@ -1537,6 +1537,7 @@ void WCMD_echo (const WCHAR *args) WCMD_output_asis(L"\r\n"); } free(trimmed); + return NO_ERROR; }
/***************************************************************************** diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index da4eaca21af..7f4bf69979a 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -168,7 +168,7 @@ void WCMD_copy (WCHAR *); void WCMD_create_dir (WCHAR *); BOOL WCMD_delete (WCHAR *); void WCMD_directory (WCHAR *); -void WCMD_echo (const WCHAR *); +RETURN_CODE WCMD_echo(const WCHAR *); void WCMD_endlocal (void); void WCMD_enter_paged_mode(const WCHAR *); RETURN_CODE WCMD_exit(void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 9fc78119f3c..cbea093f400 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1834,7 +1834,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_directory (parms_start); break; case WCMD_ECHO: - WCMD_echo(&whichcmd[count]); + return_code = WCMD_echo(&whichcmd[count]); break; case WCMD_GOTO: return_code = WCMD_goto();