From: Thomas Heller <theller@ctypes.org>
Date: Wed, 22 Dec 2004 15:46:01 +0000 (+0000)
Subject: Close stdout and stderr, which are redirected into a temp file, before
X-Git-Tag: v2.3.5c1~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e35b18b9552eef440274a963719de25c9bfd51e;p=thirdparty%2FPython%2Fcpython.git

Close stdout and stderr, which are redirected into a temp file, before
trying to remove this file - the file was never removed before.

Completes the fix for [ 1067732 ] wininst --install-script leaves
residual files on C:\\
---

diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c
index b6066e1bad10..878dc1b4cc2a 100644
--- a/PC/bdist_wininst/install.c
+++ b/PC/bdist_wininst/install.c
@@ -1734,7 +1734,9 @@ FinishedDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				fprintf(stderr, "*** Could not load Python ***");
 			}
 			fflush(stderr);
+			fclose(stderr);
 			fflush(stdout);
+			fclose(stdout);
 	    
 			fp = fopen(tempname, "rb");
 			n = fread(buffer, 1, sizeof(buffer), fp);
@@ -2082,7 +2084,9 @@ BOOL Run_RemoveScript(char *line)
 		}
 	
 		fflush(stderr);
+		fclose(stderr);
 		fflush(stdout);
+		fclose(stdout);
 	
 		fp = fopen(tempname, "rb");
 		n = fread(buffer, 1, sizeof(buffer), fp);