Module: wine Branch: master Commit: d0879e4f8ca03f20d996b07dd7876a5f34e5c8f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0879e4f8ca03f20d996b07dd7876a5...
Author: Eric Pouech epouech@codeweavers.com Date: Mon Jul 1 11:56:49 2024 +0200
cmd: Set success/failure return code for SET command.
Signed-off-by: Eric Pouech epouech@codeweavers.com
---
programs/cmd/builtins.c | 73 +++++++++++++++++--------------- programs/cmd/tests/test_builtins.cmd.exp | 8 ++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7d5c30407c3..2238995b53c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3156,8 +3156,9 @@ exprerrorreturn: * Set/Show the environment variables */
-void WCMD_setshow_env (WCHAR *s) { - +RETURN_CODE WCMD_setshow_env(WCHAR *s) +{ + RETURN_CODE return_code = NO_ERROR; LPVOID env; WCHAR *p; BOOL status; @@ -3166,13 +3167,12 @@ void WCMD_setshow_env (WCHAR *s) { if (param1[0] == 0x00 && quals[0] == 0x00) { env = GetEnvironmentStringsW(); WCMD_setshow_sortenv( env, NULL ); - return; }
/* See if /P supplied, and if so echo the prompt, and read in a reply */ - if (CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - s, 2, L"/P", -1) == CSTR_EQUAL) { + else if (CompareStringW(LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + s, 2, L"/P", -1) == CSTR_EQUAL) { DWORD count;
s += 2; @@ -3188,20 +3188,22 @@ void WCMD_setshow_env (WCHAR *s) { /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = wcschr (s, '=')) == NULL )) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return_code = ERROR_INVALID_FUNCTION; } - - /* Output the prompt */ - *p++ = '\0'; - if (*p) WCMD_output_asis(p); - - /* Read the reply */ - if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count) && count > 1) { - string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ - if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ - WINE_TRACE("set /p: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), - wine_dbgstr_w(string)); - SetEnvironmentVariableW(s, string); + else + { + /* Output the prompt */ + *p++ = '\0'; + if (*p) WCMD_output_asis(p); + + /* Read the reply */ + if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count) && count > 1) { + string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ + if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ + TRACE("set /p: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), + wine_dbgstr_w(string)); + SetEnvironmentVariableW(s, string); + } }
/* See if /A supplied, and if so calculate the results of all the expressions */ @@ -3234,11 +3236,10 @@ void WCMD_setshow_env (WCHAR *s) { /* If parsing failed, issue the error message */ if (rc > 0) { WCMD_output_stderr(WCMD_LoadMessage(rc)); - return; + return_code = ERROR_INVALID_FUNCTION; } - /* If we have no context (interactive or cmd.exe /c) print the final result */ - if (!context) { + else if (!context) { swprintf(string, ARRAY_SIZE(string), L"%d", result); WCMD_output_asis(string); } @@ -3259,22 +3260,24 @@ void WCMD_setshow_env (WCHAR *s) { env = GetEnvironmentStringsW(); if (WCMD_setshow_sortenv( env, s ) == 0) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_MISSINGENV), s); - errorlevel = ERROR_INVALID_FUNCTION; + return_code = ERROR_INVALID_FUNCTION; } - return; } - *p++ = '\0'; - - if (!*p) p = NULL; - WINE_TRACE("set: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), - wine_dbgstr_w(p)); - status = SetEnvironmentVariableW(s, p); - gle = GetLastError(); - if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { - errorlevel = ERROR_INVALID_FUNCTION; - } else if (!status) WCMD_print_error(); - else if (!interactive) errorlevel = NO_ERROR; + else + { + *p++ = '\0'; + + if (!*p) p = NULL; + TRACE("set: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), + wine_dbgstr_w(p)); + status = SetEnvironmentVariableW(s, p); + gle = GetLastError(); + if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { + return_code = ERROR_INVALID_FUNCTION; + } else if (!status) WCMD_print_error(); + } } + return errorlevel = return_code; }
/**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 9131b8d4ef5..8d6025f7c54 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -573,13 +573,13 @@ SUCCESS 0 PATH=(null) SUCCESS 0 --- success/failure for SET command -@todo_wine@SUCCESS 0 SUCCESS 0 -@todo_wine@FAILURE 1 SUCCESS 0 +FAILURE 1 SUCCESS 0 -@todo_wine@FAILURE 1 -@todo_wine@FAILURE 1 +SUCCESS 0 +FAILURE 1 +FAILURE 1 --- success/failure for ASSOC command SUCCESS 0 @todo_wine@FAILURE 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d5777e8f153..2282c9f5d9c 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -198,7 +198,7 @@ void WCMD_run_program (WCHAR *command, BOOL called); RETURN_CODE WCMD_setlocal(WCHAR *args); RETURN_CODE WCMD_setshow_date(void); RETURN_CODE WCMD_setshow_default(const WCHAR *args); -void WCMD_setshow_env (WCHAR *command); +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); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index afc2eb3b531..e3ec39d65ed 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1884,7 +1884,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_endlocal(); break; case WCMD_SET: - WCMD_setshow_env (parms_start); + return_code = WCMD_setshow_env(parms_start); break; case WCMD_SHIFT: WCMD_shift (parms_start);