June 2007 - Wine-Commits - list.winehq.org

appdb/include testData_queue.php
by WineHQ June 19, 2007

June 19, 2007

ChangeSet ID: 31222 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/18 19:28:01 Modified files: include : testData_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> testData_queue: always delete empty distributions if we can Patch: http://cvs.winehq.org/patch.py?id=31222 Old revision New revision Changes Path 1.11 1.12 +1 -1 appdb/include/testData_queue.php Index: appdb/include/testData_queue.php diff -u -p appdb/include/testData_queue.php:1.11 appdb/include/testData_queue.php:1.12 --- appdb/include/testData_queue.php:1.11 19 Jun 2007 0:28: 1 -0000 +++ appdb/include/testData_queue.php 19 Jun 2007 0:28: 1 -0000 @@ -31,7 +31,7 @@ class testData_queue queue for admins to clean up unused, queued entries */ $this->oDistribution = new distribution($this->oDistribution->iDistributionId); if(!sizeof($this->oDistribution->aTestingIds) && - $this->oDistribution->sQueued != "false") + $this->oDistribution->canEdit()) $this->oDistribution->delete(); return $bSuccess;

1 0

appdb/unit_test test_appData.php
by WineHQ June 19, 2007

June 19, 2007

ChangeSet ID: 31221 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/18 19:27:13 Modified files: unit_test : test_appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Cleanup appData test Patch: http://cvs.winehq.org/patch.py?id=31221 Old revision New revision Changes Path 1.2 1.3 +5 -0 appdb/unit_test/test_appData.php Index: appdb/unit_test/test_appData.php diff -u -p appdb/unit_test/test_appData.php:1.2 appdb/unit_test/test_appData.php:1.3 --- appdb/unit_test/test_appData.php:1.2 19 Jun 2007 0:27:13 -0000 +++ appdb/unit_test/test_appData.php 19 Jun 2007 0:27:13 -0000 @@ -27,12 +27,17 @@ function test_appData_listSubmittedBy() $shReturn = appData::listSubmittedBy($oUser->iUserId, true); + /* This is needed for deleting the entry */ + $oUser->addPriv("admin"); + /* There should be two lines; one header and one for the downloadurl */ $iExpected = 2; $iReceived = substr_count($shReturn, "</tr>"); if($iExpected != $iReceived) { echo "Got $iReceived rows instead of $iExpected.\n"; + $oDownloadUrl->delete(); + $oUser->delete(); return FALSE; }

1 0

appdb/ include/downloadurl.php include/screens ...
by WineHQ June 19, 2007

June 19, 2007

ChangeSet ID: 31220 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/18 19:26:21 Modified files: include : downloadurl.php screenshot.php version.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Cleanup objectManager tests so all objects created during the test are deleted Patch: http://cvs.winehq.org/patch.py?id=31220 Old revision New revision Changes Path 1.19 1.20 +1 -0 appdb/include/downloadurl.php 1.71 1.72 +1 -1 appdb/include/screenshot.php 1.132 1.133 +1 -1 appdb/include/version.php 1.15 1.16 +65 -24 appdb/unit_test/test_om_objects.php

1 0

Jason Edmeades : cmd.exe: Fix FOR so it works as 'well' as before.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 54d890ca1e4cf8a52e6a468bc43d1d916bb2b800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d890ca1e4cf8a52e6a468bc… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:28 2007 +0100 cmd.exe: Fix FOR so it works as 'well' as before. --- programs/cmd/batch.c | 20 +--- programs/cmd/builtins.c | 339 ++++++++++++++++++++++++++++++----------------- programs/cmd/wcmd.h | 9 +- programs/cmd/wcmdmain.c | 61 ++++++--- 4 files changed, 272 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54d890ca1e4cf8a52e6a4…

1 0

Jason Edmeades : cmd.exe: for loop by default only matches files.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 196fb10c327241f3a27a96faa44e149160395c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=196fb10c327241f3a27a96faa… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:29 2007 +0100 cmd.exe: for loop by default only matches files. --- programs/cmd/builtins.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a764228..2a075c5 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -593,6 +593,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR variable[4]; WCHAR *firstCmd; int thisDepth; + BOOL isDirs = FALSE; /* Check: the first line includes the % variable name as first parm @@ -667,10 +668,15 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { hff = FindFirstFile (item, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - thisCmdStart = cmdStart; - WINE_TRACE("Processing FOR filename %s\n", wine_dbgstr_w(fd.cFileName)); - WCMD_part_execute (&thisCmdStart, firstCmd, variable, - fd.cFileName, FALSE, TRUE); + BOOL isDirectory = (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + if ((isDirs && isDirectory) || + (!isDirs && !isDirectory)) + { + thisCmdStart = cmdStart; + WINE_TRACE("Processing FOR filename %s\n", wine_dbgstr_w(fd.cFileName)); + WCMD_part_execute (&thisCmdStart, firstCmd, variable, + fd.cFileName, FALSE, TRUE); + } } while (FindNextFile(hff, &fd) != 0); FindClose (hff);

1 0

Jason Edmeades : cmd.exe: Support IF..ELSE processing tolerate multiline/ part lines.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: d2e7b401a296b3b8ec7370909190230e2d184f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e7b401a296b3b8ec7370909… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:27 2007 +0100 cmd.exe: Support IF..ELSE processing tolerate multiline/part lines. --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 89 +++++++++++++++++++++++++++++++++++++++++++++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 61 ++++++++++++++++++++++---------- 4 files changed, 130 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2e7b401a296b3b8ec737…

1 0

Jason Edmeades : cmd.exe: Correctly parse IF ELSE plus multipart/multiline.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 345cb891752d6f594c488a371f702b013a6e7aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=345cb891752d6f594c488a371… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:26 2007 +0100 cmd.exe: Correctly parse IF ELSE plus multipart/multiline. --- programs/cmd/wcmdmain.c | 49 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5ccd6d8..a9beb61 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1909,12 +1909,17 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF static WCHAR *extraSpace = NULL; /* Deliberately never freed */ const WCHAR remCmd[] = {'r','e','m',' ','\0'}; const WCHAR forCmd[] = {'f','o','r',' ','\0'}; + const WCHAR ifCmd[] = {'i','f',' ','\0'}; + const WCHAR ifElse[] = {'e','l','s','e',' ','\0'}; BOOL inRem = FALSE; BOOL inFor = FALSE; + BOOL inIf = FALSE; + BOOL inElse= FALSE; BOOL onlyWhiteSpace = FALSE; BOOL lastWasWhiteSpace = FALSE; - BOOL lastWasDo = FALSE; - BOOL lastWasIn = FALSE; + BOOL lastWasDo = FALSE; + BOOL lastWasIn = FALSE; + BOOL lastWasElse = FALSE; /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) @@ -1952,7 +1957,7 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* Certain commands need special handling */ if (curLen == 0) { - const WCHAR forDO[] = {'d','o',' ','\0'}; + const WCHAR forDO[] = {'d','o',' ','\0'}; /* If command starts with 'rem', ignore any &&, ( etc */ if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, @@ -1964,6 +1969,26 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF curPos, 4, forCmd, -1) == 2) { inFor = TRUE; + /* If command starts with 'if' or 'else', handle ('s mid line. We should ensure this + is only true in the command portion of the IF statement, but this + should suffice for now + FIXME: Silly syntax like "if 1(==1( ( + echo they equal + )" will be parsed wrong */ + } else if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, ifCmd, -1) == 2) { + inIf = TRUE; + + } else if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 5, ifElse, -1) == 2) { + inElse = TRUE; + lastWasElse = TRUE; + onlyWhiteSpace = TRUE; + memcpy(&curString[curLen], curPos, 5*sizeof(WCHAR)); + curLen+=5; + curPos+=5; + continue; + /* In a for loop, the DO command will follow a close bracket followed by whitespace, followed by DO, ie closeBracket inserts a NULL entry, curLen is then 0, and all whitespace is skipped */ @@ -2025,10 +2050,12 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF ie start of line or just after &&, then we read until an unquoted ) is found */ WINE_TRACE("Found '(' conditions: curLen(%d), inQ(%d), onlyWS(%d)" - ", for(%d, In:%d, Do:%d)\n", + ", for(%d, In:%d, Do:%d)" + ", if(%d, else:%d, lwe:%d)\n", curLen, inQuotes, onlyWhiteSpace, - inFor, lastWasIn, lastWasDo); + inFor, lastWasIn, lastWasDo, + inIf, inElse, lastWasElse); if (curLen == 0) { curDepth++; @@ -2037,8 +2064,15 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF curString[curLen++] = *curPos; /* In a FOR loop, an unquoted '(' may occur straight after - IN or DO */ - } else if (inFor && (lastWasIn || lastWasDo) && onlyWhiteSpace) { + IN or DO + In an IF statement just handle it regardless as we don't + parse the operands + In an ELSE statement, only allow it straight away after + the ELSE and whitespace + */ + } else if (inIf || + (inElse && lastWasElse && onlyWhiteSpace) || + (inFor && (lastWasIn || lastWasDo) && onlyWhiteSpace)) { /* Add the current command */ thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(CMD_LIST)); @@ -2166,7 +2200,6 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* If we have reached the end of the string, see if bracketing outstanding */ if (*curPos == 0x00 && curDepth > 0 && readFrom != INVALID_HANDLE_VALUE) { inRem = FALSE; - inFor = FALSE; isAmphersand = FALSE; inQuotes = FALSE; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR));

1 0

Jason Edmeades : cmd.exe: Parse multipart FOR statements.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: d4afe81c3f839066ff5eaa292bd90db58aaf029f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4afe81c3f839066ff5eaa292… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:25 2007 +0100 cmd.exe: Parse multipart FOR statements. --- programs/cmd/wcmdmain.c | 118 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 110 insertions(+), 8 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a690cb0..5ccd6d8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1907,8 +1907,14 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF CMD_LIST *lastEntry = NULL; BOOL isAmphersand = FALSE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ - const WCHAR rem[] = {'r','e','m',' ','\0'}; + const WCHAR remCmd[] = {'r','e','m',' ','\0'}; + const WCHAR forCmd[] = {'f','o','r',' ','\0'}; BOOL inRem = FALSE; + BOOL inFor = FALSE; + BOOL onlyWhiteSpace = FALSE; + BOOL lastWasWhiteSpace = FALSE; + BOOL lastWasDo = FALSE; + BOOL lastWasIn = FALSE; /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) @@ -1939,13 +1945,57 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF WCHAR thisChar; - /* If command starts with 'rem', ignore any &&, ( etc */ - if (curLen == 0 && !inRem) { + /* Debugging AID: + WINE_TRACE("Looking at '%c' (len:%d, lws:%d, ows:%d)\n", *curPos, curLen, + lastWasWhiteSpace, onlyWhiteSpace); + */ + + /* Certain commands need special handling */ + if (curLen == 0) { + const WCHAR forDO[] = {'d','o',' ','\0'}; + + /* If command starts with 'rem', ignore any &&, ( etc */ if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, rem, -1) == 2) { + curPos, 4, remCmd, -1) == 2) { inRem = TRUE; - } else { - inRem = FALSE; + + /* If command starts with 'for', handle ('s mid line after IN or DO */ + } else if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 4, forCmd, -1) == 2) { + inFor = TRUE; + + /* In a for loop, the DO command will follow a close bracket followed by + whitespace, followed by DO, ie closeBracket inserts a NULL entry, curLen + is then 0, and all whitespace is skipped */ + } else if (inFor && + (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, forDO, -1) == 2)) { + WINE_TRACE("Found DO\n"); + lastWasDo = TRUE; + onlyWhiteSpace = TRUE; + memcpy(&curString[curLen], curPos, 3*sizeof(WCHAR)); + curLen+=3; + curPos+=3; + continue; + } + } else { + + /* Special handling for the 'FOR' command */ + if (inFor && lastWasWhiteSpace) { + const WCHAR forIN[] = {'i','n',' ','\0'}; + + WINE_TRACE("Found 'FOR', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); + + if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, forIN, -1) == 2) { + WINE_TRACE("Found IN\n"); + lastWasIn = TRUE; + onlyWhiteSpace = TRUE; + memcpy(&curString[curLen], curPos, 3*sizeof(WCHAR)); + curLen+=3; + curPos+=3; + continue; + } } } @@ -1955,20 +2005,61 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF if (!inRem) thisChar = *curPos; else thisChar = 'X'; /* Character with no special processing */ + lastWasWhiteSpace = FALSE; /* Will be reset below */ + switch (thisChar) { case '\t':/* drop through - ignore whitespace at the start of a command */ case ' ': if (curLen > 0) curString[curLen++] = *curPos; + + /* Remember just processed whitespace */ + lastWasWhiteSpace = TRUE; + break; case '"': inQuotes = !inQuotes; break; - case '(': if (inQuotes || curLen > 0) { + case '(': /* If a '(' is the first non whitespace in a command portion + ie start of line or just after &&, then we read until an + unquoted ) is found */ + WINE_TRACE("Found '(' conditions: curLen(%d), inQ(%d), onlyWS(%d)" + ", for(%d, In:%d, Do:%d)\n", + curLen, inQuotes, + onlyWhiteSpace, + inFor, lastWasIn, lastWasDo); + if (curLen == 0) { + curDepth++; + + /* If in quotes, ignore brackets */ + } else if (inQuotes) { curString[curLen++] = *curPos; - } else { + + /* In a FOR loop, an unquoted '(' may occur straight after + IN or DO */ + } else if (inFor && (lastWasIn || lastWasDo) && onlyWhiteSpace) { + + /* Add the current command */ + thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(CMD_LIST)); + thisEntry->command = HeapAlloc(GetProcessHeap(), 0, + (curLen+1) * sizeof(WCHAR)); + memcpy(thisEntry->command, curString, curLen * sizeof(WCHAR)); + thisEntry->command[curLen] = 0x00; + curLen = 0; + thisEntry->nextcommand = NULL; + thisEntry->isAmphersand = isAmphersand; + thisEntry->bracketDepth = curDepth; + if (lastEntry) { + lastEntry->nextcommand = thisEntry; + } else { + *output = thisEntry; + } + lastEntry = thisEntry; + curDepth++; + } else { + curString[curLen++] = *curPos; } break; @@ -2041,6 +2132,16 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF curPos++; + /* At various times we need to know if we have only skipped whitespace, + so reset this variable and then it will remain true until a non + whitespace is found */ + if ((thisChar != ' ') && (thisChar != '\n')) onlyWhiteSpace = FALSE; + + /* Flag end of interest in FOR DO and IN parms once something has been processed */ + if (!lastWasWhiteSpace) { + lastWasIn = lastWasDo = FALSE; + } + /* If we have reached the end, add this command into the list */ if (*curPos == 0x00 && curLen > 0) { @@ -2065,6 +2166,7 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* If we have reached the end of the string, see if bracketing outstanding */ if (*curPos == 0x00 && curDepth > 0 && readFrom != INVALID_HANDLE_VALUE) { inRem = FALSE; + inFor = FALSE; isAmphersand = FALSE; inQuotes = FALSE; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR));

1 0

Jason Edmeades : cmd.exe: EXIT /b skips any residual commands.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: d2474dece3f242120b694594e55f30bc5cd433e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2474dece3f242120b694594e… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:24 2007 +0100 cmd.exe: EXIT /b skips any residual commands. --- programs/cmd/builtins.c | 3 ++- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6901cd3..ebbef1b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2053,7 +2053,7 @@ int WCMD_volume (int mode, WCHAR *path) { * */ -void WCMD_exit (void) { +void WCMD_exit (CMD_LIST **cmdList) { static const WCHAR parmB[] = {'/','B','\0'}; int rc = atoiW(param1); /* Note: atoi of empty parameter is 0 */ @@ -2061,6 +2061,7 @@ void WCMD_exit (void) { if (context && lstrcmpiW(quals, parmB) == 0) { errorlevel = rc; context -> skip_rest = TRUE; + *cmdList = NULL; } else { ExitProcess(rc); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c1af0bd..ebb0fde 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -50,7 +50,7 @@ void WCMD_directory (WCHAR *); void WCMD_echo (const WCHAR *); void WCMD_endlocal (void); void WCMD_enter_paged_mode(const WCHAR *); -void WCMD_exit (void); +void WCMD_exit (CMD_LIST **cmdList); void WCMD_for (WCHAR *, CMD_LIST **cmdList); void WCMD_give_help (WCHAR *command); void WCMD_goto (CMD_LIST **cmdList); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1addd55..a690cb0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -799,7 +799,7 @@ void WCMD_process_command (WCHAR *command, CMD_LIST **cmdList) WCMD_more(p); break; case WCMD_EXIT: - WCMD_exit (); + WCMD_exit (cmdList); break; default: WCMD_run_program (whichcmd, 0);

1 0

Jason Edmeades : cmd.exe: Lines starting with REM ignore any multiline/ part characters.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: de4c6970a31782b004fae5d83399fda20bdd2747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4c6970a31782b004fae5d83… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jun 15 20:59:23 2007 +0100 cmd.exe: Lines starting with REM ignore any multiline/part characters. --- programs/cmd/wcmdmain.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 30c1921..1addd55 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1907,6 +1907,8 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF CMD_LIST *lastEntry = NULL; BOOL isAmphersand = FALSE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ + const WCHAR rem[] = {'r','e','m',' ','\0'}; + BOOL inRem = FALSE; /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) @@ -1934,7 +1936,26 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* Parse every character on the line being processed */ while (*curPos != 0x00) { - switch (*curPos) { + + WCHAR thisChar; + + /* If command starts with 'rem', ignore any &&, ( etc */ + if (curLen == 0 && !inRem) { + if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 4, rem, -1) == 2) { + inRem = TRUE; + } else { + inRem = FALSE; + } + } + + /* Nothing 'ends' a REM statement and &&, quotes etc are ineffective, + so just use the default processing ie skip character specific + matching below */ + if (!inRem) thisChar = *curPos; + else thisChar = 'X'; /* Character with no special processing */ + + switch (thisChar) { case '\t':/* drop through - ignore whitespace at the start of a command */ case ' ': if (curLen > 0) @@ -2043,6 +2064,7 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* If we have reached the end of the string, see if bracketing outstanding */ if (*curPos == 0x00 && curDepth > 0 && readFrom != INVALID_HANDLE_VALUE) { + inRem = FALSE; isAmphersand = FALSE; inQuotes = FALSE; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR));

1 0