openoffice-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jaguNET.com>
Subject Re: [openoffice] branch AOO417 updated: Sync w/ SVN
Date Wed, 14 Aug 2019 18:39:22 GMT
afaik, gitbox auto syncs w/ github. I prefer using our gitbox rather than github directly.
it's the grey-beard in me :)

> On Aug 14, 2019, at 1:51 PM, Matthias Seidel <matthias.seidel@hamburg.de> wrote:
> 
> Great, that seems to work!
> Did you do that via Self-Service?
> 
> https://selfserve.apache.org/
> 
> Regards,
> 
>    Matthias
> 
> Am 14.08.19 um 19:26 schrieb jim@apache.org:
>> This is an automated email from the ASF dual-hosted git repository.
>> 
>> jim pushed a commit to branch AOO417
>> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>> 
>> 
>> The following commit(s) were added to refs/heads/AOO417 by this push:
>>     new 4aba5f8  Sync w/ SVN
>> 4aba5f8 is described below
>> 
>> commit 4aba5f85ea42f3f097b6465edfd2f848bb5ed4b3
>> Author: Jim Jagielski <jimjag@gmail.com>
>> AuthorDate: Wed Aug 14 13:26:17 2019 -0400
>> 
>>    Sync w/ SVN
>> ---
>> main/odk/source/unoapploader/unx/unoapploader.c | 22 ++++++++-------
>> main/sal/osl/unx/nlsupport.c                    | 36 ++++++++++---------------
>> 2 files changed, 26 insertions(+), 32 deletions(-)
>> 
>> diff --git a/main/odk/source/unoapploader/unx/unoapploader.c b/main/odk/source/unoapploader/unx/unoapploader.c
>> index 540aad7..226f181 100644
>> --- a/main/odk/source/unoapploader/unx/unoapploader.c
>> +++ b/main/odk/source/unoapploader/unx/unoapploader.c
>> @@ -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" );
>> diff --git a/main/sal/osl/unx/nlsupport.c b/main/sal/osl/unx/nlsupport.c
>> index 203e478..23c0938 100644
>> --- a/main/sal/osl/unx/nlsupport.c
>> +++ b/main/sal/osl/unx/nlsupport.c
>> @@ -876,31 +876,23 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
>>      * This is a hack. We know that we are setting some envvars here
>>      * and due to https://bz.apache.org/ooo/show_bug.cgi?id=127965
>>      * we need to update PATH on macOS. Doing it here ensures
>> -     * that it's done but it's not the right location to be doing
>> +     * that it's done but it's not the perfect location to be doing
>>      * this.
>> -     * 
>> -     * Also address https://bz.apache.org/ooo/show_bug.cgi?id=127966
>> -     * here as well :/
>>      */
>>     opath = getenv ( "PATH" );
>> -    slen = strlen( "/usr/local/bin" ) + 1;
>> -    if ( opath != NULL )
>> -        slen += strlen( ":" ) + strlen( opath );
>> -    npath = malloc( slen );
>> -    if ( opath != NULL ) {
>> -        strcat( npath, opath );
>> -        strcat( npath, ":" );
>> -    }
>> -    strcat( npath, "/usr/local/bin" ); /* We are adding at the end */
>> -    setenv("PATH", npath, 1 );
>> -    free(npath);
>> -
>> -/* https://bz.apache.org/ooo/show_bug.cgi?id=127966 */
>> -    opath = getenv ( "HOME" );
>> -    if ( opath && *opath ) {
>> -        chdir ( opath );
>> -    } else {
>> -        chdir ( "/tmp" );
>> +    if (!strstr ( opath, "/usr/local/bin" )) {
>> +        slen = strlen( "/usr/local/bin" ) + 1;
>> +        if ( opath != NULL )
>> +            slen += strlen( ":" ) + strlen( opath );
>> +        npath = malloc( slen );
>> +        *npath = '\0';
>> +        if ( opath != NULL ) {
>> +            strcat( npath, opath );
>> +            strcat( npath, ":" );
>> +        }
>> +        strcat( npath, "/usr/local/bin" ); /* We are adding at the end */
>> +        setenv("PATH", npath, 1 );
>> +        free(npath);
>>     }
>> 
>> #ifdef DEBUG
>> 
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org


Mime
View raw message