kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Using CreateFile with FILE_FLAG_DELETE_ON_CLOSE to automatically delete the Win9x forwarding executable even if the parent process crashes.

Browse Source
This commit is contained in:
Brad King 2003-12-14 13:47:39 -05:00
parent 8da78710bc
commit 5dcbef7dfe
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/kwsys/ProcessWin32.c
View File

@ -187,6 +187,9 @@ struct kwsysProcess_s
char* PipeFileSTDOUT; char* PipeFileSTDOUT;
char* PipeFileSTDERR; char* PipeFileSTDERR;
/* Handle to automatically delete the Win9x forwarding executable. */
HANDLE Win9xHandle;
/* ------------- Data managed per call to Execute ------------- */ /* ------------- Data managed per call to Execute ------------- */
/* The exceptional behavior that terminated the process, if any. */ /* The exceptional behavior that terminated the process, if any. */
@ -286,7 +289,8 @@ kwsysProcess* kwsysProcess_New()
/* Construct the executable name from the process id and kwsysProcess /* Construct the executable name from the process id and kwsysProcess
instance. This should be unique. */ instance. This should be unique. */
sprintf(fwdName, "cmw9xfwd_%u_%p.exe", GetCurrentProcessId(), cp); sprintf(fwdName, KWSYS_NAMESPACE_STRING "pew9xfwd_%u_%p.exe",
GetCurrentProcessId(), cp);
/* If we have a temp directory, use it. */ /* If we have a temp directory, use it. */
if(length > 0 && length <= _MAX_PATH) if(length > 0 && length <= _MAX_PATH)
@ -315,6 +319,19 @@ kwsysProcess* kwsysProcess_New()
kwsysProcess_Delete(cp); kwsysProcess_Delete(cp);
return 0; return 0;
} }
/* Get a handle to the file that will delete it when closed. */
cp->Win9xHandle = CreateFile(win9x, GENERIC_READ, FILE_SHARE_READ, 0,
OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, 0);
if(cp->Win9xHandle == INVALID_HANDLE_VALUE)
{
/* We were not able to get a read handle for the forwarding
executable. It will not be deleted properly. Give up. */
_unlink(win9x);
free(win9x);
kwsysProcess_Delete(cp);
return 0;
}
} }
else else
{ {
@ -475,8 +492,9 @@ void kwsysProcess_Delete(kwsysProcess* cp)
} }
if(cp->Win9x) if(cp->Win9x)
{ {
_unlink(cp->Win9x); /* Close or handle to the forwarding executable file. This will
free(cp->Win9x); cause it to be deleted. */
kwsysProcessCleanupHandle(&cp->Win9xHandle);
} }
free(cp); free(cp);
} }