Mozilla/mozilla/xpcom/threads/nsProcessCommon.cpp
syd%netscape.com aa42fb70f8 Fix for http://bugzilla.mozilla.org/show_bug.cgi?id=80383
r=dbragg, sr=mscott, a=asa

For the nsIProcess component, which is only used by XPInstall, instead of calling
nspr for process creation, we call a simplified version which, on windows, will
cause the child process not to inherit fds open by the forking process.

Fix is only XP_WIN. nspr will provide a more risky, non-nsIProcess, XP solution at
some point which is either achieved by modifying open() to accept a non-inherit
flag (on win32) or do an fcntl() on Unix (see the bug for details specific to the
fcntl()), or provide another pair of create processes functions that are geared
towards non-inheriting process creation.

The bug fixed here is the XP installer is not able, on win32, to remove the
components.reg file from the "cleanup" process, which leads to all sorts of mayhem,
because the cleanup process inherits the component.reg fd which is open at the
time the cleanup process is forked, and this it cannot remove something it has an
open reference to.


git-svn-id: svn://10.0.0.236/trunk@96205 18797224-902f-48f8-a5cc-f745e15eee43
2001-06-02 00:06:44 +00:00

236 lines
6.2 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code,
* released March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape Communications
* Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Don Bragg <dbragg@netscape.com>
*/
/*****************************************************************************
*
* nsProcess is used to execute new processes and specify if you want to
* wait (blocking) or continue (non-blocking).
*
*****************************************************************************
*/
#include "nsCOMPtr.h"
#include "nsMemory.h"
#include "nsProcess.h"
#include "prtypes.h"
#include "prio.h"
#include <stdlib.h>
#if defined( XP_WIN )
#include "nsString.h"
#include "nsLiteralString.h"
#include "nsReadableUtils.h"
#include <windows.h>
#endif
//-------------------------------------------------------------------//
// nsIProcess implementation
//-------------------------------------------------------------------//
NS_IMPL_ISUPPORTS1(nsProcess, nsIProcess)
//Constructor
nsProcess::nsProcess():mExitValue(-1),
mProcess(nsnull)
{
NS_INIT_ISUPPORTS();
}
nsProcess::~nsProcess()
{
}
NS_IMETHODIMP
nsProcess::Init(nsIFile* executable)
{
PRBool isFile;
//First make sure the file exists
nsresult rv = executable->IsFile(&isFile);
if (NS_FAILED(rv)) return rv;
if (!isFile)
return NS_ERROR_FAILURE;
//Store the nsIFile in mExecutable
mExecutable = executable;
//Get the path because it is needed by the NSPR process creation
#ifdef XP_WIN
rv = mExecutable->GetTarget(getter_Copies(mTargetPath));
if (NS_FAILED(rv) || !mTargetPath )
#endif
rv = mExecutable->GetPath(getter_Copies(mTargetPath));
return rv;
}
NS_IMETHODIMP
nsProcess::Run(PRBool blocking, const char **args, PRUint32 count, PRUint32 *pid)
{
nsresult rv = NS_OK;
// make sure that when we allocate we have 1 greater than the
// count since we need to null terminate the list for the argv to
// pass into PR_CreateProcess
char **my_argv = NULL;
my_argv = (char **)malloc(sizeof(char *) * (count + 2) );
if (!my_argv) {
return NS_ERROR_OUT_OF_MEMORY;
}
// copy the args
PRUint32 i;
for (i=0; i < count; i++) {
my_argv[i+1] = NS_CONST_CAST(char*, args[i]);
}
// we need to set argv[0] to the program name.
my_argv[0] = NS_CONST_CAST(char*, mTargetPath.get());
// null terminate the array
my_argv[count+1] = NULL;
#if defined(XP_WIN)
STARTUPINFO startupInfo;
PROCESS_INFORMATION procInfo;
BOOL retVal;
ZeroMemory(&startupInfo, sizeof(startupInfo));
startupInfo.cb = sizeof(startupInfo);
retVal = CreateProcess(NULL,
NS_CONST_CAST(char*, mTargetPath.get()),
NULL, /* security attributes for the new
* process */
NULL, /* security attributes for the primary
* thread in the new process */
FALSE, /* inherit handles */
0, /* creation flags */
NULL, /* env */
NULL, /* current drive and directory */
&startupInfo,
&procInfo
);
if (blocking) {
// if success, wait for process termination. the early returns and such
// are a bit ugly but preserving the logic of the nspr code I copied to
// minimize our risk abit.
if ( retVal == TRUE ) {
DWORD dwRetVal;
unsigned long exitCode;
dwRetVal = WaitForSingleObject(procInfo.hProcess, INFINITE);
if (dwRetVal == WAIT_FAILED) {
nsMemory::Free(my_argv);
return PR_FAILURE;
}
if (GetExitCodeProcess(procInfo.hProcess, &exitCode) == FALSE) {
mExitValue = exitCode;
nsMemory::Free(my_argv);
return PR_FAILURE;
}
mExitValue = exitCode;
CloseHandle(procInfo.hProcess);
}
else
rv = PR_FAILURE;
}
else {
// map return value into success code
if ( retVal == TRUE )
rv = PR_SUCCESS;
else
rv = PR_FAILURE;
}
#else
if ( blocking ) {
mProcess = PR_CreateProcess(mTargetPath, my_argv, NULL, NULL);
if (mProcess)
rv = PR_WaitProcess(mProcess, &mExitValue);
}
else {
rv = PR_CreateProcessDetached(mTargetPath, my_argv, NULL, NULL);
}
#endif
// free up our argv
nsMemory::Free(my_argv);
if (rv != PR_SUCCESS)
return NS_ERROR_FILE_EXECUTION_FAILED;
return NS_OK;
}
NS_IMETHODIMP nsProcess::InitWithPid(PRUint32 pid)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsProcess::GetLocation(nsIFile** aLocation)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsProcess::GetPid(PRUint32 *aPid)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsProcess::GetProcessName(char** aProcessName)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsProcess::GetProcessSignature(PRUint32 *aProcessSignature)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsProcess::Kill()
{
nsresult rv = NS_OK;
if (mProcess)
rv = PR_KillProcess(mProcess);
return rv;
}
NS_IMETHODIMP
nsProcess::GetExitValue(PRInt32 *aExitValue)
{
*aExitValue = mExitValue;
return NS_OK;
}