[PATCH v3 0/1] MR3668: cmd: fixed command chaining

[Dmitry Sokolov (＠DmitrySokolov)]

Fixed the following code:

```plaintext
echo 1. && echo ok || echo failed
echo 2. || echo failed && echo --- & echo 3.
```

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55489

--
  v3: cmd: fixed command chaining
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3668

[PATCH v3 1/1] cmd: fixed command chaining

[Dmitry Sokolov]

From: Dmitry Sokolov <mr.dmitry.sokolov(a)gmail.com>

Fixed the following code:

    echo 1. && echo ok || echo failed
    echo 2. || echo failed && echo --- & echo 3.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55489
---
 programs/cmd/wcmdmain.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index d00c6e07566..f6123fb2173 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -58,6 +58,8 @@ static int max_width;
 static int numChars;
 
 #define MAX_WRITECONSOLE_SIZE 65535
+#define CMD_SUCCEEDED(res) ((res)==0)
+#define CMD_FAILED(res)    ((res)!=0)
 
 /*
  * Returns a buffer for reading from/writing to file
@@ -2360,6 +2362,7 @@ CMD_LIST *WCMD_process_commands(CMD_LIST *thisCmd, BOOL oneBracket,
                                 BOOL retrycall) {
 
     int bdepth = -1;
+    CMD_LIST *prevCmd = NULL;
 
     if (thisCmd && oneBracket) bdepth = thisCmd->bracketDepth;
 
@@ -2381,12 +2384,41 @@ CMD_LIST *WCMD_process_commands(CMD_LIST *thisCmd, BOOL oneBracket,
          about them and it will be handled in there)
          Also, skip over any batch labels (eg. :fred)          */
       if (thisCmd->command && thisCmd->command[0] != ':') {
-        WINE_TRACE("Executing command: '%s'\n", wine_dbgstr_w(thisCmd->command));
-        WCMD_execute (thisCmd->command, thisCmd->redirects, &thisCmd, retrycall);
+        /* Process the command chaining */
+        if ( (thisCmd->prevDelim == CMD_ONSUCCESS && CMD_FAILED(errorlevel)) ||
+             (thisCmd->prevDelim == CMD_ONFAILURE && CMD_SUCCEEDED(errorlevel)) ) {
+          if (prevCmd && prevCmd->bracketDepth < thisCmd->bracketDepth) {
+            /* Skipping the chain of commands in brackets */
+            int bd = thisCmd->bracketDepth;
+            do {
+              WINE_TRACE("Skipping command '%s'\n", wine_dbgstr_w(thisCmd->command));
+              prevCmd = thisCmd;
+              thisCmd = thisCmd->nextcommand;
+            } while (thisCmd && bd <= thisCmd->bracketDepth);
+            continue;
+          } else if (thisCmd->prevDelim == CMD_ONFAILURE && CMD_SUCCEEDED(errorlevel)) {
+            /* Skipping all chaining commands after '||', i.e. '|| cmd2 && cmd3 || cmd4'*/
+            do {
+              WINE_TRACE("Skipping command '%s'\n", wine_dbgstr_w(thisCmd->command));
+              prevCmd = thisCmd;
+              thisCmd = thisCmd->nextcommand;
+            } while (thisCmd && (thisCmd->prevDelim == CMD_ONSUCCESS || thisCmd->prevDelim == CMD_ONFAILURE));
+            continue;
+          } else {
+            /* Skipping the next command */
+            WINE_TRACE("Skipping command '%s'\n", wine_dbgstr_w(thisCmd->command));
+          }
+        } else {
+          WINE_TRACE("Executing command: '%s'\n", wine_dbgstr_w(thisCmd->command));
+          WCMD_execute (thisCmd->command, thisCmd->redirects, &thisCmd, retrycall);
+        }
       }
 
       /* Step on unless the command itself already stepped on */
-      if (thisCmd == origCmd) thisCmd = thisCmd->nextcommand;
+      if (thisCmd == origCmd) {
+        prevCmd = thisCmd;
+        thisCmd = thisCmd->nextcommand;
+      }
     }
     return NULL;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3668

[PATCH v3 1/1] cmd: fixed command chaining

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=136767

Your paranoid android.


=== debian11 (32 bit report) ===

cmd.exe:
batch.c:321: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 285 (got 'j3', wanted 'j3')
batch.c:321: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 308 (got 'g3', wanted 'g3')
batch.c:321: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 313 (got 'i3', wanted 'i3')
batch.c:321: Test failed: unexpected char 0x63 position 0 in line 330 (got 'c1', wanted 'b3')
batch.c:321: Test failed: unexpected char 0x32 position 1 in line 331 (got 'c2', wanted 'c1')
batch.c:321: Test failed: unexpected char 0x33 position 1 in line 332 (got 'c3', wanted 'c2')
batch.c:321: Test failed: unexpected char 0x65 position 0 in line 335 (got 'e1', wanted 'd2')
batch.c:321: Test failed: unexpected char 0x66 position 0 in line 336 (got 'f1', wanted 'd3')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 337 (got '---', wanted 'e1')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 338 (got '---', wanted 'e2')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 339 (got '---', wanted 'e3')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 340 (got '---', wanted 'f1')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 341 (got '---', wanted 'f2')
batch.c:321: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 631 (got 'foo3 not created', wanted 'foo3 not created')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 633 (got '--- on failure conditional or', wanted 'foo4')

=== debian11b (64 bit WoW report) ===

cmd.exe:
batch.c:321: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 285 (got 'j3', wanted 'j3')
batch.c:321: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 308 (got 'g3', wanted 'g3')
batch.c:321: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 313 (got 'i3', wanted 'i3')
batch.c:321: Test failed: unexpected char 0x63 position 0 in line 330 (got 'c1', wanted 'b3')
batch.c:321: Test failed: unexpected char 0x32 position 1 in line 331 (got 'c2', wanted 'c1')
batch.c:321: Test failed: unexpected char 0x33 position 1 in line 332 (got 'c3', wanted 'c2')
batch.c:321: Test failed: unexpected char 0x65 position 0 in line 335 (got 'e1', wanted 'd2')
batch.c:321: Test failed: unexpected char 0x66 position 0 in line 336 (got 'f1', wanted 'd3')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 337 (got '---', wanted 'e1')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 338 (got '---', wanted 'e2')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 339 (got '---', wanted 'e3')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 340 (got '---', wanted 'f1')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 341 (got '---', wanted 'f2')
batch.c:321: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 631 (got 'foo3 not created', wanted 'foo3 not created')
batch.c:321: Test failed: unexpected char 0x2d position 0 in line 633 (got '--- on failure conditional or', wanted 'foo4')

[PATCH v3 0/1] MR3668: cmd: fixed command chaining - closed

[Alexandre Julliard (＠julliard)]

This merge request was closed by Alexandre Julliard.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3668

[Alexandre Julliard (＠julliard)]

Likely superseded by the cmd.exe parser rewrite.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3668#note_86781