From 423d01ec92a2c99ca8309a78f6763478e299f6a3 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Mon, 4 Jun 2018 13:41:22 +0200 Subject: sal: fix logfile path retrieval from logging.ini Change-Id: I39803413533ae5b291d2e1abf4aa1bfe1f5900b5 Reviewed-on: https://gerrit.libreoffice.org/55268 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- sal/osl/all/log.cxx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'sal') diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 6a5884211949..4b6016e00951 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -156,14 +156,19 @@ char const * getLogLevel() { std::ofstream * getLogFile() { // First check the environment variable, then the setting in logging.ini static char const * logFile = getEnvironmentVariable("SAL_LOG_FILE"); - if (!logFile) - return nullptr; + if (!logFile) + { #ifdef WNT - static char logFilePath[INI_STRINGBUF_SIZE]; - if (getValueFromLoggingIniFile("LogFilePath", logFilePath)) - logFile = logFilePath; + static char logFilePath[INI_STRINGBUF_SIZE]; + if (getValueFromLoggingIniFile("LogFilePath", logFilePath)) + logFile = logFilePath; + else + return nullptr; +#else + return nullptr; #endif + } // stays until process exits static std::ofstream file(logFile, std::ios::app | std::ios::out); -- cgit