Avoid risk of looking at an errno modified by SAL_INFO() call

Thanks to Stephan for noticing.

Change-Id: I6b90258bdc6bce7b2aeb44f9a1a136b4b9bd51c9
Reviewed-on: https://gerrit.libreoffice.org/61812
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 507779c7fe6c..a45d32e4c79e 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -218,6 +218,8 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirect
             {
                 int e = errno;
                 SAL_INFO("sal.file", "opendir(" << path << "): errno " << e << ": " << strerror(e));
+                // Restore errno after possible modification by SAL_INFO above
+                errno = e;
             }
         }
     }
@@ -249,7 +251,7 @@ oslFileError SAL_CALL osl_closeDirectory(oslDirectory pDirectory)
         {
             int e = errno;
             SAL_INFO("sal.file", "closedir(" << pDirImpl->pDirStruct << "): errno " << e << ": " << strerror(e));
-            err = oslTranslateFileError(errno);
+            err = oslTranslateFileError(e);
         }
         else
             SAL_INFO("sal.file", "closedir(" << pDirImpl->pDirStruct << "): OK");
@@ -819,7 +821,7 @@ static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char*
             int e = errno;
             SAL_INFO("sal.file", "rename(" << pszDestFileName << ", " << tmpDestFile
                      << "): errno " << e << ": " << strerror(e));
-            if (errno == ENOENT)
+            if (e == ENOENT)
             {
                 DestFileExists = 0;
             }