Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-20 15:35:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] FOR: Some functionality is available only when extensions are enabled.

Browse source 
This is basically all the advanced functionality enabled with the /D,
/R, /L and /F flags, and the usage of enhanced variables.
This commit is contained in:
Hermès Bélusca-Maïto 2020-07-12 23:07:23 +02:00
parent fedc68aea8
commit 41a93a4e58
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
base/shell/cmd/for.c
View file

@ -500,19 +500,27 @@ ExecuteFor(PARSED_COMMAND *Cmd)
Cmd->For.Context = lpNew;
fc = lpNew;
if (Cmd->For.Switches & FOR_F)
/* Run the extended FOR syntax only if extensions are enabled */
if (bEnableExtensions)
{
Ret = ForF(Cmd, List, Buffer);
}
else if (Cmd->For.Switches & FOR_LOOP)
{
Ret = ForLoop(Cmd, List, Buffer);
}
else if (Cmd->For.Switches & FOR_RECURSIVE)
{
DWORD Len = GetFullPathName(Cmd->For.Params ? Cmd->For.Params : _T("."),
MAX_PATH, Buffer, NULL);
Ret = ForRecursive(Cmd, List, Buffer, &Buffer[Len]);
if (Cmd->For.Switches & FOR_F)
{
Ret = ForF(Cmd, List, Buffer);
}
else if (Cmd->For.Switches & FOR_LOOP)
{
Ret = ForLoop(Cmd, List, Buffer);
}
else if (Cmd->For.Switches & FOR_RECURSIVE)
{
DWORD Len = GetFullPathName(Cmd->For.Params ? Cmd->For.Params : _T("."),
MAX_PATH, Buffer, NULL);
Ret = ForRecursive(Cmd, List, Buffer, &Buffer[Len]);
}
else
{
Ret = ForDir(Cmd, List, Buffer, Buffer);
}
}
else
{

6
base/shell/cmd/parser.c
View file

@ -494,6 +494,10 @@ static PARSED_COMMAND *ParseFor(void)
memset(Cmd, 0, sizeof(PARSED_COMMAND));
Cmd->Type = C_FOR;
/* Skip the extended FOR syntax if extensions are disabled */
if (!bEnableExtensions)
goto parseForBody;
while (1)
{
if (_tcsicmp(CurrentToken, _T("/D")) == 0)
@ -543,6 +547,8 @@ static PARSED_COMMAND *ParseFor(void)
goto error;
}
parseForBody:
/* Variable name should be % and just one other character */
if (CurrentToken[0] != _T('%') || _tcslen(CurrentToken) != 2)
goto error;