odk/source/unoapploader/unx/unoapploader.c | 8 ++++++++ sal/osl/unx/nlsupport.c | 11 +++++++++++ 2 files changed, 19 insertions(+)
New commits: commit b0b289f53eb1fca99aefc4e6f97e0ce612ca86dc Author: Jim Jagielski <j...@apache.org> AuthorDate: Thu Jan 31 17:36:53 2019 +0000 Commit: Jim Jagielski <j...@apache.org> CommitDate: Thu Jan 31 17:36:53 2019 +0000 Additional env setup for https://bz.apache.org/ooo/show_bug.cgi?id=127966 fix diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c index 1fb1540134f3..0152badd0db3 100644 --- a/odk/source/unoapploader/unx/unoapploader.c +++ b/odk/source/unoapploader/unx/unoapploader.c @@ -220,6 +220,14 @@ int main( int argc, char *argv[] ) } 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" ); + if ( value && *value ) { + chdir ( value ); + } else { + chdir ( "/tmp" ); + } #endif } else commit 485bdc2130fb47589186076235c534ba8f10d6f6 Author: Jim Jagielski <j...@apache.org> AuthorDate: Thu Jan 31 17:34:26 2019 +0000 Commit: Jim Jagielski <j...@apache.org> CommitDate: Thu Jan 31 17:34:26 2019 +0000 Fix https://bz.apache.org/ooo/show_bug.cgi?id=127966 in a location where we know environments are setup Set the CWD to $HOME or to /tmp as a backup on macOS diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c index dc640a38ce7c..0a4c47eef172 100644 --- a/sal/osl/unx/nlsupport.c +++ b/sal/osl/unx/nlsupport.c @@ -878,6 +878,9 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale ) * 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 * 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; @@ -893,6 +896,14 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale ) 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" ); + } + #ifdef DEBUG fprintf( stderr, "nlsupport.c: _imp_getProcessLocale() returning %s as current locale.\n", locale ); #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits