Eric Pouech : cmd: Run pipe LHS & RHS outside of any batch context.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 30bbc1804dd631ef7a7a04130e1768e3049b01bf
URL:    https://gitlab.winehq.org/wine/wine/-/commit/30bbc1804dd631ef7a7a04130e1768e...

Author: Eric Pouech <epouech(a)codeweavers.com>
Date:   Mon Jul 15 18:29:19 2024 +0200

cmd: Run pipe LHS & RHS outside of any batch context.

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>

---

 programs/cmd/tests/test_builtins.cmd.exp | 2 +-
 programs/cmd/wcmdmain.c                  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 0ad3b0c80bd..33d4609f289 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -489,7 +489,7 @@ FAILURE 2
 --- success/failure for pipes
 b
 @todo_wine(a)SUCCESS 0
-(a)todo_wine@FAILURE 1
+FAILURE 1
 a
 @todo_wine(a)SUCCESS 0
 FAILURE 3
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index dd49f2ab65d..e1c8802f6e8 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -3700,7 +3700,10 @@ RETURN_CODE node_execute(CMD_NODE *node)
             WCHAR filename[MAX_PATH];
             CMD_REDIRECTION *output;
             HANDLE saved_output;
+            BATCH_CONTEXT *saved_context = context;
 
+            /* pipe LHS & RHS are run outside of any batch context */
+            context = NULL;
             /* FIXME: a real pipe instead of writing to an intermediate file would be
              * better.
              * But waiting for completion of commands will require more work.
@@ -3743,6 +3746,7 @@ RETURN_CODE node_execute(CMD_NODE *node)
             }
             else return_code = ERROR_INVALID_FUNCTION;
             redirection_dispose_list(output);
+            context = saved_context;
         }
         break;
     case CMD_IF: