From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/cmd/builtins.c | 45 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2db7d3d53aa..ef84bee64ac 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3210,31 +3210,32 @@ RETURN_CODE WCMD_setshow_prompt(void)
RETURN_CODE WCMD_setshow_time(void) { - RETURN_CODE return_code = NO_ERROR; - WCHAR curtime[64], buffer[64]; - DWORD count; - SYSTEMTIME st; + RETURN_CODE return_code = NO_ERROR; + WCHAR curtime[64], buffer[64]; + SYSTEMTIME st;
- if (!*param1) { - GetLocalTime(&st); - if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) { - WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); - if (wcsstr(quals, L"/T") == NULL) { - WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); - WCMD_output_flush(); - if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count) && - count > 2) { - WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); + if (!*param1) + { + GetLocalTime(&st); + if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) + { + WCMD_output(WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); + if (wcsstr(quals, L"/T") == NULL) + { + WCMD_output(WCMD_LoadMessage(WCMD_NEWTIME)); + WCMD_output_flush(); + if (WCMD_fgets(buffer, ARRAY_SIZE(buffer), GetStdHandle(STD_INPUT_HANDLE))) + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NYI)); + } } - } + else WCMD_print_error(); } - else WCMD_print_error (); - } - else { - return_code = ERROR_INVALID_FUNCTION; - WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); - } - return errorlevel = return_code; + else + { + return_code = ERROR_INVALID_FUNCTION; + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NYI)); + } + return errorlevel = return_code; }
/****************************************************************************