unoapploader.c (2e9bc605) unoapploader.c (ca3b41fa)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 192 unchanged lines hidden (view full) ---

201 free( libpath );
202 }
203 if ( value != NULL )
204 {
205 strcat( envstr, PATHSEPARATOR );
206 strcat( envstr, value );
207 }
208 putenv( envstr );
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 192 unchanged lines hidden (view full) ---

201 free( libpath );
202 }
203 if ( value != NULL )
204 {
205 strcat( envstr, PATHSEPARATOR );
206 strcat( envstr, value );
207 }
208 putenv( envstr );
209#ifdef MACOSX
210 /* https://bz.apache.org/ooo/show_bug.cgi?id=127965 */
211 value = getenv( "PATH" );
212 size = strlen( "PATH" ) + strlen( "=/usr/local/bin" ) + 1;
213 if ( value != NULL )
214 size += strlen( PATHSEPARATOR ) + strlen( value );
215 envstr = (char*) malloc( size );
216 strcpy( envstr, "PATH=" );
217 if ( value != NULL ) {
218 strcat( envstr, value);
219 strcat( envstr, PATHSEPARATOR);
220 }
221 strcat( envstr, "/usr/local/bin" ); /* We are adding at the end */
222 putenv( envstr );
223#endif
209 }
210 else
211 {
212 fprintf( stderr, "Warning: no office installation found!\n" );
213 fflush( stderr );
214 }
215
216 /* set the executable name for the application process */

--- 90 unchanged lines hidden --- 		224 }
225 else
226 {
227 fprintf( stderr, "Warning: no office installation found!\n" );
228 fflush( stderr );
229 }
230
231 /* set the executable name for the application process */

--- 90 unchanged lines hidden ---