[PATCH 1/7] [cmd] Fix regression around prompting during copy

Ann and Jason Edmeades jason at edmeades.me.uk
Fri Oct 12 04:52:24 CDT 2012


b1dacc6c379ede878b5740a8ab5df635538b6e14 introduced a problem where
a copy inside a batch script launched interactively now prompts
about overwriting files whereas it should not. This patch fixes it.
No tests added in this patch but will be exercised by a forthcoming
suite of tests around the copy statement which I am just finalizing.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20121012/2c29c30e/attachment.html>
-------------- next part --------------
From 41df5b0096e93b447c7ba32c155ed9f3a08b397a Mon Sep 17 00:00:00 2001
From: Jason Edmeades <jason at edmeades.me.uk>
Date: Thu, 4 Oct 2012 09:57:33 +0100
Subject: [PATCH 1/7] [cmd] Fix regression around prompting during copy

b1dacc6c379ede878b5740a8ab5df635538b6e14 introduced a problem where
a copy inside a batch script launched interactively now prompts
about overwriting files whereas it should not. This patch fixes it.
No tests added in this patch but will be exercised by a forthcoming
suite of tests around the copy statement which I am just finalizing.
---
 programs/cmd/wcmdmain.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 3c18356..5109ecf 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1162,7 +1162,10 @@ void WCMD_run_program (WCHAR *command, BOOL called)
 
       /* Special case BAT and CMD */
       if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) {
+        BOOL oldinteractive = interactive;
+        interactive = FALSE;
         WCMD_batch (thisDir, command, called, NULL, INVALID_HANDLE_VALUE);
+        interactive = oldinteractive;
         return;
       } else {
 
-- 
1.7.9.5


More information about the wine-patches mailing list