2001-01-20 00:23:24 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2004-04-18 18:21:17 +04:00
|
|
|
/* ***** BEGIN LICENSE BLOCK *****
|
|
|
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
|
|
*
|
|
|
|
* The contents of this file are subject to the Mozilla 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/MPL/
|
|
|
|
*
|
|
|
|
* 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 the Initial Developer are Copyright (C) 1998-1999
|
|
|
|
* the Initial Developer. All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Contributor(s):
|
|
|
|
* Don Bragg <dbragg@netscape.com>
|
|
|
|
*
|
|
|
|
* Alternatively, the contents of this file may be used under the terms of
|
|
|
|
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
|
|
|
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
|
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
|
|
|
* of those above. If you wish to allow use of your version of this file only
|
|
|
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
|
|
|
* use your version of this file under the terms of the MPL, indicate your
|
|
|
|
* decision by deleting the provisions above and replace them with the notice
|
|
|
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
|
|
|
* the provisions above, a recipient may use your version of this file under
|
|
|
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
|
|
|
*
|
|
|
|
* ***** END LICENSE BLOCK ***** */
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* 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"
|
2002-03-23 00:37:50 +03:00
|
|
|
#include "prenv.h"
|
|
|
|
#include "nsCRT.h"
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
2004-10-12 09:31:37 +04:00
|
|
|
#if defined(XP_WIN)
|
2001-06-06 08:33:19 +04:00
|
|
|
#include "prmem.h"
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
#include "nsString.h"
|
|
|
|
#include "nsLiteralString.h"
|
|
|
|
#include "nsReadableUtils.h"
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
|
2004-10-12 09:31:37 +04:00
|
|
|
#if defined(XP_MACOSX)
|
|
|
|
#include <Processes.h>
|
|
|
|
#include "nsILocalFileMac.h"
|
|
|
|
#endif
|
|
|
|
|
2001-01-20 00:23:24 +03:00
|
|
|
//-------------------------------------------------------------------//
|
|
|
|
// nsIProcess implementation
|
|
|
|
//-------------------------------------------------------------------//
|
|
|
|
NS_IMPL_ISUPPORTS1(nsProcess, nsIProcess)
|
|
|
|
|
|
|
|
//Constructor
|
2004-11-11 22:42:26 +03:00
|
|
|
nsProcess::nsProcess()
|
|
|
|
: mExitValue(-1),
|
|
|
|
mProcess(nsnull)
|
2001-01-20 00:23:24 +03:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsProcess::Init(nsIFile* executable)
|
|
|
|
{
|
2005-02-24 21:41:50 +03:00
|
|
|
NS_ENSURE_ARG_POINTER(executable);
|
2001-01-20 00:23:24 +03:00
|
|
|
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
|
2002-04-27 09:33:09 +04:00
|
|
|
rv = mExecutable->GetNativeTarget(mTargetPath);
|
|
|
|
if (NS_FAILED(rv) || mTargetPath.IsEmpty() )
|
2001-01-20 00:23:24 +03:00
|
|
|
#endif
|
2002-04-27 09:33:09 +04:00
|
|
|
rv = mExecutable->GetNativePath(mTargetPath);
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-10-12 09:31:37 +04:00
|
|
|
#if defined(XP_WIN)
|
2008-12-11 22:50:24 +03:00
|
|
|
// Out param `wideCmdLine` must be PR_Freed by the caller.
|
|
|
|
static int assembleCmdLine(char *const *argv, PRUnichar **wideCmdLine)
|
2001-06-06 08:33:19 +04:00
|
|
|
{
|
|
|
|
char *const *arg;
|
2008-12-11 22:50:24 +03:00
|
|
|
char *p, *q, *cmdLine;
|
2001-06-06 08:33:19 +04:00
|
|
|
int cmdLineSize;
|
|
|
|
int numBackslashes;
|
|
|
|
int i;
|
|
|
|
int argNeedQuotes;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find out how large the command line buffer should be.
|
|
|
|
*/
|
|
|
|
cmdLineSize = 0;
|
|
|
|
for (arg = argv; *arg; arg++) {
|
|
|
|
/*
|
|
|
|
* \ and " need to be escaped by a \. In the worst case,
|
|
|
|
* every character is a \ or ", so the string of length
|
|
|
|
* may double. If we quote an argument, that needs two ".
|
|
|
|
* Finally, we need a space between arguments, and
|
|
|
|
* a null byte at the end of command line.
|
|
|
|
*/
|
|
|
|
cmdLineSize += 2 * strlen(*arg) /* \ and " need to be escaped */
|
|
|
|
+ 2 /* we quote every argument */
|
|
|
|
+ 1; /* space in between, or final null */
|
|
|
|
}
|
2008-12-11 22:50:24 +03:00
|
|
|
p = cmdLine = (char *) PR_MALLOC(cmdLineSize*sizeof(char));
|
2001-06-06 08:33:19 +04:00
|
|
|
if (p == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (arg = argv; *arg; arg++) {
|
|
|
|
/* Add a space to separates the arguments */
|
|
|
|
if (arg != argv) {
|
|
|
|
*p++ = ' ';
|
|
|
|
}
|
|
|
|
q = *arg;
|
|
|
|
numBackslashes = 0;
|
|
|
|
argNeedQuotes = 0;
|
|
|
|
|
|
|
|
/* If the argument contains white space, it needs to be quoted. */
|
|
|
|
if (strpbrk(*arg, " \f\n\r\t\v")) {
|
|
|
|
argNeedQuotes = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argNeedQuotes) {
|
|
|
|
*p++ = '"';
|
|
|
|
}
|
|
|
|
while (*q) {
|
|
|
|
if (*q == '\\') {
|
|
|
|
numBackslashes++;
|
|
|
|
q++;
|
|
|
|
} else if (*q == '"') {
|
|
|
|
if (numBackslashes) {
|
|
|
|
/*
|
|
|
|
* Double the backslashes since they are followed
|
|
|
|
* by a quote
|
|
|
|
*/
|
|
|
|
for (i = 0; i < 2 * numBackslashes; i++) {
|
|
|
|
*p++ = '\\';
|
|
|
|
}
|
|
|
|
numBackslashes = 0;
|
|
|
|
}
|
|
|
|
/* To escape the quote */
|
|
|
|
*p++ = '\\';
|
|
|
|
*p++ = *q++;
|
|
|
|
} else {
|
|
|
|
if (numBackslashes) {
|
|
|
|
/*
|
|
|
|
* Backslashes are not followed by a quote, so
|
|
|
|
* don't need to double the backslashes.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < numBackslashes; i++) {
|
|
|
|
*p++ = '\\';
|
|
|
|
}
|
|
|
|
numBackslashes = 0;
|
|
|
|
}
|
|
|
|
*p++ = *q++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we are at the end of this argument */
|
|
|
|
if (numBackslashes) {
|
|
|
|
/*
|
|
|
|
* Double the backslashes if we have a quote string
|
|
|
|
* delimiter at the end.
|
|
|
|
*/
|
|
|
|
if (argNeedQuotes) {
|
|
|
|
numBackslashes *= 2;
|
|
|
|
}
|
|
|
|
for (i = 0; i < numBackslashes; i++) {
|
|
|
|
*p++ = '\\';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (argNeedQuotes) {
|
|
|
|
*p++ = '"';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*p = '\0';
|
2008-12-11 22:50:24 +03:00
|
|
|
PRInt32 numChars = MultiByteToWideChar(CP_ACP, 0, cmdLine, -1, NULL, 0);
|
|
|
|
*wideCmdLine = (PRUnichar *) PR_MALLOC(numChars*sizeof(PRUnichar));
|
|
|
|
MultiByteToWideChar(CP_ACP, 0, cmdLine, -1, *wideCmdLine, numChars);
|
|
|
|
PR_Free(cmdLine);
|
2001-06-06 08:33:19 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2004-02-29 01:34:07 +03:00
|
|
|
// XXXldb |args| has the wrong const-ness
|
2001-01-20 00:23:24 +03:00
|
|
|
NS_IMETHODIMP
|
2004-11-11 22:42:26 +03:00
|
|
|
nsProcess::Run(PRBool blocking, const char **args, PRUint32 count,
|
|
|
|
PRUint32 *pid)
|
2001-01-20 00:23:24 +03:00
|
|
|
{
|
2005-02-24 21:41:50 +03:00
|
|
|
NS_ENSURE_TRUE(mExecutable, NS_ERROR_NOT_INITIALIZED);
|
2005-01-14 14:52:09 +03:00
|
|
|
PRStatus status = PR_SUCCESS;
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
// 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;
|
2005-01-14 14:52:09 +03:00
|
|
|
my_argv = (char **)nsMemory::Alloc(sizeof(char *) * (count + 2) );
|
2001-01-20 00:23:24 +03:00
|
|
|
if (!my_argv) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
// copy the args
|
|
|
|
PRUint32 i;
|
|
|
|
for (i=0; i < count; i++) {
|
2007-07-08 11:08:04 +04:00
|
|
|
my_argv[i+1] = const_cast<char*>(args[i]);
|
2001-01-20 00:23:24 +03:00
|
|
|
}
|
|
|
|
// we need to set argv[0] to the program name.
|
2004-02-29 01:34:07 +03:00
|
|
|
my_argv[0] = mTargetPath.BeginWriting();
|
2001-01-20 00:23:24 +03:00
|
|
|
// null terminate the array
|
|
|
|
my_argv[count+1] = NULL;
|
|
|
|
|
2005-09-02 22:00:23 +04:00
|
|
|
#if defined(XP_WIN) && !defined (WINCE) /* wince uses nspr */
|
2008-12-11 22:50:24 +03:00
|
|
|
STARTUPINFOW startupInfo;
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
PROCESS_INFORMATION procInfo;
|
|
|
|
BOOL retVal;
|
2008-12-11 22:50:24 +03:00
|
|
|
PRUnichar *cmdLine;
|
2001-06-06 08:33:19 +04:00
|
|
|
|
|
|
|
if (assembleCmdLine(my_argv, &cmdLine) == -1) {
|
|
|
|
nsMemory::Free(my_argv);
|
|
|
|
return NS_ERROR_FILE_EXECUTION_FAILED;
|
|
|
|
}
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
|
|
|
|
ZeroMemory(&startupInfo, sizeof(startupInfo));
|
|
|
|
startupInfo.cb = sizeof(startupInfo);
|
|
|
|
|
2008-03-13 00:03:08 +03:00
|
|
|
/* The CREATE_NO_WINDOW flag is important to prevent console
|
|
|
|
* windows from appearing. This makes behavior the same on all
|
|
|
|
* platforms. This won't work on win9x, however. The flag will
|
|
|
|
* not have any effect on non-console applications.
|
|
|
|
*/
|
|
|
|
|
2008-12-11 22:50:24 +03:00
|
|
|
retVal = CreateProcessW(NULL,
|
|
|
|
// const_cast<char*>(mTargetPath.get()),
|
|
|
|
cmdLine,
|
|
|
|
NULL, /* security attributes for the new
|
|
|
|
* process */
|
|
|
|
NULL, /* security attributes for the primary
|
|
|
|
* thread in the new process */
|
|
|
|
FALSE, /* inherit handles */
|
|
|
|
CREATE_NO_WINDOW, /* creation flags */
|
|
|
|
NULL, /* env */
|
|
|
|
NULL, /* current drive and directory */
|
|
|
|
&startupInfo,
|
|
|
|
&procInfo
|
|
|
|
);
|
2005-02-24 21:41:50 +03:00
|
|
|
PR_Free( cmdLine );
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
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);
|
2005-01-14 14:52:09 +03:00
|
|
|
return NS_ERROR_FAILURE;
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
}
|
|
|
|
if (GetExitCodeProcess(procInfo.hProcess, &exitCode) == FALSE) {
|
|
|
|
mExitValue = exitCode;
|
|
|
|
nsMemory::Free(my_argv);
|
2005-01-14 14:52:09 +03:00
|
|
|
return NS_ERROR_FAILURE;
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
}
|
|
|
|
mExitValue = exitCode;
|
|
|
|
CloseHandle(procInfo.hProcess);
|
2006-09-22 11:43:07 +04:00
|
|
|
CloseHandle(procInfo.hThread);
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
}
|
|
|
|
else
|
2005-01-14 14:52:09 +03:00
|
|
|
status = PR_FAILURE;
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
|
|
|
|
// map return value into success code
|
|
|
|
|
2004-11-11 22:42:26 +03:00
|
|
|
if (retVal == TRUE)
|
2005-01-14 14:52:09 +03:00
|
|
|
status = PR_SUCCESS;
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
else
|
2005-01-14 14:52:09 +03:00
|
|
|
status = PR_FAILURE;
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
}
|
|
|
|
|
2004-12-10 04:06:37 +03:00
|
|
|
#else // Note, this must not be an #elif ...!
|
|
|
|
|
|
|
|
#if defined(XP_MACOSX)
|
2004-11-11 22:42:26 +03:00
|
|
|
if (count == 0) {
|
|
|
|
FSSpec resolvedSpec;
|
|
|
|
OSErr err = noErr;
|
|
|
|
|
|
|
|
nsCOMPtr<nsILocalFileMac> macExecutable =
|
|
|
|
do_QueryInterface(mExecutable);
|
|
|
|
macExecutable->GetFSSpec(&resolvedSpec);
|
|
|
|
|
|
|
|
LaunchParamBlockRec launchPB;
|
|
|
|
launchPB.launchAppSpec = &resolvedSpec;
|
|
|
|
launchPB.launchAppParameters = NULL;
|
|
|
|
launchPB.launchBlockID = extendedBlock;
|
|
|
|
launchPB.launchEPBLength = extendedBlockLen;
|
|
|
|
launchPB.launchFileFlags = NULL;
|
|
|
|
launchPB.launchControlFlags =
|
|
|
|
launchContinue + launchNoFileFlags + launchUseMinimum;
|
|
|
|
if (!blocking)
|
|
|
|
launchPB.launchControlFlags += launchDontSwitch;
|
|
|
|
|
|
|
|
err = LaunchApplication(&launchPB);
|
|
|
|
|
|
|
|
// NOTE: blocking mode assumes you are running on a thread
|
|
|
|
// other than the UI thread that has the main event loop
|
|
|
|
if (blocking && err == noErr) {
|
|
|
|
while (1) {
|
|
|
|
ProcessInfoRec info;
|
|
|
|
info.processInfoLength = sizeof(ProcessInfoRec);
|
|
|
|
info.processName = NULL;
|
|
|
|
info.processAppSpec = NULL;
|
|
|
|
|
|
|
|
err = GetProcessInformation(&launchPB.launchProcessSN, &info);
|
|
|
|
|
|
|
|
if (err != noErr) {
|
|
|
|
// The process is no longer in the process
|
|
|
|
// manager's internal list, assume the process is
|
|
|
|
// done.
|
|
|
|
err = noErr;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2004-10-12 09:31:37 +04:00
|
|
|
|
2004-11-11 22:42:26 +03:00
|
|
|
// still running so sleep some more (200 msecs)
|
|
|
|
PR_Sleep(200);
|
|
|
|
}
|
2004-10-12 09:31:37 +04:00
|
|
|
}
|
2004-10-23 03:55:56 +04:00
|
|
|
|
2004-11-11 22:42:26 +03:00
|
|
|
if (err != noErr) {
|
2005-01-14 14:52:09 +03:00
|
|
|
status = PR_FAILURE;
|
2004-11-11 22:42:26 +03:00
|
|
|
}
|
2004-10-23 03:55:56 +04:00
|
|
|
|
2004-11-11 22:42:26 +03:00
|
|
|
if (blocking) {
|
|
|
|
mExitValue = err;
|
|
|
|
}
|
2004-11-11 23:48:45 +03:00
|
|
|
} else
|
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.
2001-06-02 04:06:44 +04:00
|
|
|
#endif
|
2004-11-11 23:48:45 +03:00
|
|
|
{
|
2004-11-11 22:42:26 +03:00
|
|
|
if (blocking) {
|
|
|
|
mProcess = PR_CreateProcess(mTargetPath.get(), my_argv, NULL,
|
|
|
|
NULL);
|
|
|
|
if (mProcess)
|
2005-01-14 14:52:09 +03:00
|
|
|
status = PR_WaitProcess(mProcess, &mExitValue);
|
2004-11-11 22:42:26 +03:00
|
|
|
} else {
|
2005-01-14 14:52:09 +03:00
|
|
|
status = PR_CreateProcessDetached(mTargetPath.get(), my_argv, NULL,
|
2004-11-11 22:42:26 +03:00
|
|
|
NULL);
|
|
|
|
}
|
|
|
|
}
|
2004-12-10 04:06:37 +03:00
|
|
|
#endif
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
// free up our argv
|
|
|
|
nsMemory::Free(my_argv);
|
|
|
|
|
2005-01-14 14:52:09 +03:00
|
|
|
if (status != PR_SUCCESS)
|
2001-01-20 00:23:24 +03:00
|
|
|
return NS_ERROR_FILE_EXECUTION_FAILED;
|
2004-10-12 09:31:37 +04:00
|
|
|
|
2001-01-20 00:23:24 +03:00
|
|
|
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)
|
2005-02-24 21:41:50 +03:00
|
|
|
rv = PR_KillProcess(mProcess) == PR_SUCCESS ? NS_OK : NS_ERROR_FAILURE;
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsProcess::GetExitValue(PRInt32 *aExitValue)
|
|
|
|
{
|
|
|
|
*aExitValue = mExitValue;
|
|
|
|
|
|
|
|
return NS_OK;
|
|
|
|
}
|