INTEGRATION: CWS macrestart_DEV300 (1.1.2); FILE ADDED

2008/08/22 21:36:47 hro 1.1.2.3: #i92798# Fixed concurrency between soffice.sh and officeloader delivering
2008/08/22 18:50:02 hro 1.1.2.2: #i92798# Fixed uninitialized oslProcessInfo.size member
2008/08/22 16:31:12 hro 1.1.2.1: #i92798# Officeloader for macosx
This commit is contained in:
Rüdiger Timm 2008-08-29 09:28:40 +00:00
parent d2e9fd2819
commit 21af0abf77

View file

@ -0,0 +1,113 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: officeloader.cxx,v $
* $Revision: 1.2 $
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_desktop.hxx"
#include <sal/main.h>
#include <osl/process.h>
#include <rtl/ustring.hxx>
#include "../../../source/inc/exithelper.hxx"
using namespace rtl;
using namespace desktop;
SAL_IMPLEMENT_MAIN()
{
oslProcess process;
oslProcessError error;
OUString sExecutableFile;
rtl_uString **pCommandArgs;
sal_uInt32 nCommandArgs;
osl_getExecutableFile( &sExecutableFile.pData );
sExecutableFile += OUString( RTL_CONSTASCII_USTRINGPARAM(".bin") );
nCommandArgs = osl_getCommandArgCount();
pCommandArgs = new rtl_uString *[nCommandArgs];
for ( sal_uInt32 i = 0; i < nCommandArgs; i++ )
{
pCommandArgs[i] = NULL;
osl_getCommandArg( i, &pCommandArgs[i] );
}
bool bRestart = false;
bool bFirstRun = true;
oslProcessExitCode exitcode = 255;
do {
error = osl_executeProcess(
sExecutableFile.pData,
bFirstRun ? pCommandArgs : NULL,
bFirstRun ? nCommandArgs : 0,
0,
NULL,
NULL,
NULL,
0,
&process
);
if ( osl_Process_E_None == error )
{
oslProcessInfo info;
info.Size = sizeof(info);
error = osl_joinProcess( process );
if ( osl_Process_E_None != error )
break;
error = osl_getProcessInfo( process, osl_Process_EXITCODE, &info );
if ( osl_Process_E_None != error )
break;
if ( info.Fields & osl_Process_EXITCODE )
{
exitcode = info.Code;
bRestart = (ExitHelper::E_CRASH_WITH_RESTART == exitcode);
}
else
break;
osl_freeProcessHandle( process );
}
bFirstRun = false;
} while ( bRestart );
return exitcode;
}