You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/08/14 15:54:59 UTC
svn commit: r1865165 -
/openoffice/branches/AOO417/main/odk/source/unoapploader/unx/unoapploader.c
Author: jim
Date: Wed Aug 14 15:54:59 2019
New Revision: 1865165
URL: http://svn.apache.org/viewvc?rev=1865165&view=rev
Log:
Also backport here as well
Modified:
openoffice/branches/AOO417/main/odk/source/unoapploader/unx/unoapploader.c
Modified: openoffice/branches/AOO417/main/odk/source/unoapploader/unx/unoapploader.c
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO417/main/odk/source/unoapploader/unx/unoapploader.c?rev=1865165&r1=1865164&r2=1865165&view=diff
==============================================================================
--- openoffice/branches/AOO417/main/odk/source/unoapploader/unx/unoapploader.c (original)
+++ openoffice/branches/AOO417/main/odk/source/unoapploader/unx/unoapploader.c Wed Aug 14 15:54:59 2019
@@ -209,17 +209,19 @@ int main( int argc, char *argv[] )
#ifdef MACOSX
/* https://bz.apache.org/ooo/show_bug.cgi?id=127965 */
value = getenv( "PATH" );
- size = strlen( "PATH" ) + strlen( "=/usr/local/bin" ) + 1;
- if ( value != NULL )
- size += strlen( PATHSEPARATOR ) + strlen( value );
- envstr = (char*) malloc( size );
- strcpy( envstr, "PATH=" );
- if ( value != NULL ) {
- strcat( envstr, value);
- strcat( envstr, PATHSEPARATOR);
+ if (!strstr ( value, "/usr/local/bin" )) {
+ size = strlen( "PATH" ) + strlen( "=/usr/local/bin" ) + 1;
+ if ( value != NULL )
+ size += strlen( PATHSEPARATOR ) + strlen( value );
+ envstr = (char*) malloc( size );
+ strcpy( envstr, "PATH=" );
+ if ( value != NULL ) {
+ strcat( envstr, value);
+ strcat( envstr, PATHSEPARATOR);
+ }
+ strcat( envstr, "/usr/local/bin" ); /* We are adding at the end */
+ putenv( envstr );
}
- strcat( envstr, "/usr/local/bin" ); /* We are adding at the end */
- putenv( envstr );
/* https://bz.apache.org/ooo/show_bug.cgi?id=127966 */
value = getenv ( "HOME" );