Kaydet (Commit) df46ec05 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

osl_getCommandArg always returns osl_Process_E_None

Change-Id: I0ff1e44f17976fd3a3060d8ee7fe15d77c918b79
üst 2d724f08
......@@ -344,11 +344,7 @@ SAL_IMPLEMENT_MAIN()
!read_argument( &keyfile, info_keyfile, &nPos ) &&
!read_argument( &delaySign, info_delaySign, &nPos ))
{
if ( osl_getCommandArg( nPos, &cmd_arg.pData ) !=
osl_Process_E_None )
{
OSL_ASSERT( false );
}
osl_getCommandArg( nPos, &cmd_arg.pData );
++nPos;
cmd_arg = cmd_arg.trim();
if (cmd_arg.getLength() > 0)
......
......@@ -1152,7 +1152,7 @@ void restartOnMac(bool passArguments) {
sal_uInt32 n = osl_getCommandArgCount();
for (sal_uInt32 i = 0; i < n; ++i) {
OUString arg;
OSL_VERIFY(osl_getCommandArg(i, &arg.pData) == osl_Process_E_None);
osl_getCommandArg(i, &arg.pData);
if (arg.match("--accept=")) {
wait = true;
}
......
......@@ -103,8 +103,7 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::
for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
{
OUString aArg;
if ( osl_getCommandArg( i, &aArg.pData ) )
break;
osl_getCommandArg( i, &aArg.pData );
if ( aArg.matchIgnoreAsciiCaseAsciiL( PIPE_ARG, sizeof( PIPE_ARG ) - 1, 0 ) )
{
OUString aNum = aArg.copy( sizeof( PIPE_ARG ) - 1 );
......
......@@ -494,46 +494,42 @@ static int ReportCrash( int Signal )
for ( argi = 0; argi < argc; argi++ )
{
if ( osl_Process_E_None == osl_getCommandArg( argi, &ustrCommandArg ) )
osl_getCommandArg( argi, &ustrCommandArg );
if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr( ustrCommandArg ), "--nocrashreport" ) )
{
if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr( ustrCommandArg ), "--nocrashreport" ) )
{
rtl_uString_release( ustrCommandArg );
return -1;
}
else if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr( ustrCommandArg ), "--autocrashreport" ) )
{
bAutoCrashReport = true;
}
else if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength(
rtl_uString_getStr( ustrCommandArg ), rtl_uString_getLength( ustrCommandArg ),
REPORTENV_PARAM, strlen(REPORTENV_PARAM) )
)
{
rtl_uString *ustrEnvironment = NULL;
rtl_String *strEnv = NULL;
rtl_uString_newFromStr( &ustrEnvironment, rtl_uString_getStr( ustrCommandArg ) + strlen(REPORTENV_PARAM) );
rtl_uString_release( ustrCommandArg );
return -1;
}
else if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr( ustrCommandArg ), "--autocrashreport" ) )
{
bAutoCrashReport = true;
}
else if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength(
rtl_uString_getStr( ustrCommandArg ), rtl_uString_getLength( ustrCommandArg ),
REPORTENV_PARAM, strlen(REPORTENV_PARAM) )
)
{
rtl_uString *ustrEnvironment = NULL;
rtl_String *strEnv = NULL;
if ( ustrEnvironment )
{
rtl_uString2String(
&strEnv,
rtl_uString_getStr( ustrEnvironment ), rtl_uString_getLength( ustrEnvironment ),
osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS
);
rtl_uString_newFromStr( &ustrEnvironment, rtl_uString_getStr( ustrCommandArg ) + strlen(REPORTENV_PARAM) );
if ( strEnv )
{
putenv( rtl_string_getStr( strEnv ) );
rtl_string_release( strEnv );
}
if ( ustrEnvironment )
{
rtl_uString2String(
&strEnv,
rtl_uString_getStr( ustrEnvironment ), rtl_uString_getLength( ustrEnvironment ),
osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS
);
rtl_uString_release( ustrEnvironment );
if ( strEnv )
{
putenv( rtl_string_getStr( strEnv ) );
rtl_string_release( strEnv );
}
rtl_uString_release( ustrEnvironment );
}
}
}
......
......@@ -2204,9 +2204,8 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str
for (n = 0; n < nArgs; n++)
{
rtl_uString * strCommandArg = NULL;
if ((osl_getCommandArg( n, &strCommandArg ) == osl_Process_E_None) &&
((strCommandArg->buffer[0] == L'-') || (strCommandArg->buffer[0] == L'+')) &&
osl_getCommandArg( n, &strCommandArg );
if (((strCommandArg->buffer[0] == L'-') || (strCommandArg->buffer[0] == L'+')) &&
(rtl_ustr_ascii_compare_WithLength(strCommandArg->buffer, RTL_CONSTASCII_LENGTH(SVERSION_OPTION), SVERSION_OPTION)))
{
sal_Unicode *pCommandArg = strCommandArg->buffer + RTL_CONSTASCII_LENGTH(SVERSION_OPTION);
......
......@@ -167,10 +167,10 @@ const char* SalGenericSystem::getFrameResName()
for( int n = 0; n < nArgs-1; n++ )
{
OUString aArg;
if( ! osl_getCommandArg( n, &aArg.pData ) &&
aArg.equalsIgnoreAsciiCase("-name") &&
! osl_getCommandArg( n+1, &aArg.pData ) )
osl_getCommandArg( n, &aArg.pData );
if( aArg.equalsIgnoreAsciiCase("-name") )
{
osl_getCommandArg( n+1, &aArg.pData );
aResName.append( OUStringToOString( aArg, osl_getThreadTextEncoding() ) );
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment