lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-08 00:46:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CMD] Fix support for newlines in the emulated parenthesed set block of the "for" command.

Browse Source 
CORE-7998
This commit is contained in:
Hermès Bélusca-Maïto
2017-11-17 00:56:35 +01:00
parent 8dd89c7cfc
commit 8340574fe3
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
base/shell/cmd/parser.c
View File

@@ -55,7 +55,7 @@ static TCHAR CurrentToken[CMDLINE_LENGTH];
static int CurrentTokenType;
static int InsideBlock;
static TCHAR ParseChar()
static TCHAR ParseChar(void)
{
TCHAR Char;
@@ -69,7 +69,9 @@ restart:
* even separate tokens.
*/
do
{
Char = *ParsePos++;
}
while (Char == _T('\r'));
if (!Char)
@@ -91,7 +93,7 @@ restart:
return CurChar = Char;
}
static void ParseError()
static void ParseError(void)
{
error_syntax(CurrentTokenType != TOK_END ? CurrentToken : NULL);
bParseError = TRUE;
@@ -317,6 +319,7 @@ static PARSED_COMMAND *ParseBlock(REDIRECTION *RedirList)
if (CurrentTokenType == TOK_END_BLOCK)
break;
/* Skip past the \n */
ParseChar();
}
@@ -502,6 +505,13 @@ static PARSED_COMMAND *ParseFor(void)
if (Type == TOK_END_BLOCK)
break;
if (Type == TOK_END)
{
/* Skip past the \n */
ParseChar();
continue;
}
if (Type != TOK_NORMAL)
goto error;