629dfff3c7
...that involves adding a second, one-off special meaning to the existing sal_detail_initialize function. This at least gets rid of the "osl_getExecutableFile contains 'soffice' substring" guesswork (and of the osl_systemPathGetFileNameOrLastDirectoryPart call there, which is what I'm actually after, for a different change to come). Change-Id: I4dd6eef1fd0411bf66943ffea415876c92d08526 Reviewed-on: https://gerrit.libreoffice.org/78291 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
96 lines
3.3 KiB
C++
96 lines
3.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <config_features.h>
|
|
|
|
#include <sal/config.h>
|
|
|
|
#if defined MACOSX
|
|
#include <cassert>
|
|
#include <limits>
|
|
#include <unistd.h>
|
|
#include <sys/stat.h>
|
|
#endif
|
|
|
|
#include <config_global.h>
|
|
#include <osl/process.h>
|
|
#include <sal/main.h>
|
|
#include <sal/types.h>
|
|
|
|
#include "saltime.hxx"
|
|
#include "soffice.hxx"
|
|
#include <salusesyslog.hxx>
|
|
|
|
#if HAVE_SYSLOG_H
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <syslog.h>
|
|
#endif
|
|
|
|
extern "C" {
|
|
|
|
void sal_detail_initialize(int argc, char ** argv) {
|
|
if (argc == sal::detail::InitializeSoffice)
|
|
{
|
|
sal::detail::setSoffice();
|
|
return;
|
|
}
|
|
#if defined MACOSX && !HAVE_FEATURE_MACOSX_SANDBOX
|
|
// On macOS when not sandboxed, soffice can restart itself via exec (see
|
|
// restartOnMac in desktop/source/app/app.cxx), which leaves all file
|
|
// descriptors open, which in turn can have unwanted effects (see
|
|
// <https://bugs.libreoffice.org/show_bug.cgi?id=50603> "Unable to update
|
|
// LibreOffice without resetting user profile"). But closing fds in
|
|
// restartOnMac before calling exec does not work, as additional threads
|
|
// might still be running then, which can still use those fds and cause
|
|
// crashes. Therefore, the simplest solution is to close fds at process
|
|
// start (as early as possible, so that no other threads have been created
|
|
// yet that might already have opened some fds); this is done for all kinds
|
|
// of processes here, not just soffice, but hopefully none of our processes
|
|
// rely on being spawned with certain fds already open. Unfortunately, Mac
|
|
// macOS appears to have no better interface to close all fds (like
|
|
// closefrom):
|
|
long openMax = sysconf(_SC_OPEN_MAX);
|
|
if (openMax == -1) {
|
|
// Some random value, but hopefully sysconf never returns -1 anyway:
|
|
openMax = 1024;
|
|
}
|
|
assert(openMax >= 0 && openMax <= std::numeric_limits< int >::max());
|
|
for (int fd = 3; fd < int(openMax); ++fd) {
|
|
struct stat s;
|
|
if (fstat(fd, &s) != -1 && S_ISREG(s.st_mode))
|
|
close(fd);
|
|
}
|
|
#endif
|
|
sal_initGlobalTimer();
|
|
#if HAVE_SYSLOG_H
|
|
const char *use_syslog = getenv("SAL_LOG_SYSLOG");
|
|
sal_use_syslog = use_syslog != nullptr && !strcmp(use_syslog, "1");
|
|
if (sal_use_syslog)
|
|
openlog("libreoffice", 0, LOG_USER);
|
|
#endif
|
|
|
|
osl_setCommandArgs(argc, argv);
|
|
}
|
|
|
|
void sal_detail_deinitialize() {}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|