Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-21 05:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMD] DATE: Simplify the input loop, based on the TIME command.

Browse source 
Set also the ERRORLEVEL in case of error.
This commit is contained in:
Hermès Bélusca-Maïto 2020-07-12 18:23:57 +02:00
parent a151893351
commit 80844dc185
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
base/shell/cmd/date.c
View file

@ -212,9 +212,9 @@ INT cmd_date(LPTSTR param)
return 0; return 0;
} }
if (nDateString == -1) while (TRUE)
{ {
while (TRUE) if (nDateString == -1)
{ {
PrintDateString(); PrintDateString();
ConInString(szDate, ARRAYSIZE(szDate)); ConInString(szDate, ARRAYSIZE(szDate));
@ -229,30 +229,21 @@ INT cmd_date(LPTSTR param)
freep(arg); freep(arg);
return 0; return 0;
} }
ConErrResPuts(STRING_DATE_ERROR);
} }
} else
else
{
if (!ParseDate(arg[nDateString]))
{ {
while (TRUE) if (ParseDate(arg[nDateString]))
{ {
ConErrResPuts(STRING_DATE_ERROR); freep(arg);
return 0;
PrintDateString();
ConInString(szDate, ARRAYSIZE(szDate));
while (*szDate && szDate[_tcslen(szDate) - 1] < _T(' '))
szDate[_tcslen(szDate) - 1] = _T('\0');
if (ParseDate(szDate))
{
freep(arg);
return 0;
}
} }
/* Force input the next time around */
nDateString = -1;
} }
ConErrResPuts(STRING_DATE_ERROR);
nErrorLevel = 1;
} }
freep(arg); freep(arg);