Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 08:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] Fix the implementation of EXIT /B when a batch context is active.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2020-08-07 02:13:27 +02:00
parent d78e8029b8
commit 82bcb3f9f0
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -509,8 +509,12 @@ INT cmd_rmdir (LPTSTR param)
/* /*
* set the exitflag to true * Either exits the command interpreter, or quits the current batch context.
*/ */
/* Enable this define for supporting EXIT /B even when extensions are disabled */
// #define SUPPORT_EXIT_B_NO_EXTENSIONS
INT CommandExit(LPTSTR param) INT CommandExit(LPTSTR param)
{ {
if (!_tcsncmp(param, _T("/?"), 2)) if (!_tcsncmp(param, _T("/?"), 2))
@ -522,7 +526,7 @@ INT CommandExit(LPTSTR param)
return 0; return 0;
} }
if (_tcsnicmp(param, _T("/b"), 2) == 0) if (_tcsnicmp(param, _T("/B"), 2) == 0)
{ {
param += 2; param += 2;
@ -532,8 +536,29 @@ INT CommandExit(LPTSTR param)
*/ */
if (bc) if (bc)
{ {
bc->current = NULL; /* Windows' CMD compatibility: Use GOTO :EOF */
ExitBatch(); TCHAR EofLabel[] = _T(":EOF");
#ifdef SUPPORT_EXIT_B_NO_EXTENSIONS
/*
* Temporarily enable extensions so as to support :EOF.
*
* Our GOTO implementation ensures that, when extensions are
* enabled and the label is ':EOF', no immediate change of batch
* context (done e.g. via ExitBatch() calls) is performed.
* This will therefore ensure that we do not spoil the extensions
* state when we restore it below.
*/
BOOL bOldEnableExtensions = bEnableExtensions;
bEnableExtensions = TRUE;
#endif
cmd_goto(EofLabel);
#ifdef SUPPORT_EXIT_B_NO_EXTENSIONS
/* Restore the original state of the extensions */
bEnableExtensions = bOldEnableExtensions;
#endif
} }
else else
{ {