diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-09-09 23:13:12 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-09-10 08:04:54 +0200 |
| commit | eedf523c123a82bf3cbc5f389783e22d75b2e2c5 (patch) | |
| tree | 30ae8a55cc9bb769dc1abb897ead5857a4cfe6fe /sal | |
| parent | d05780f102c29b734e21ca729031d625ebf283ef (diff) | |
tdf#127069 sal: preserve gid of files in the unx osl_replaceFile()
The w32 implementation preserves all attributes of the destination
file, the unx one preserved none of them.
Bring the unx osl_replaceFile() closer to the w32 by preserving the gid
of the destination file as a start.
[ No testcase, we support building on systems where the user is part of
a single group only, and it's not possible to verify the effect of this
change in such environments. ]
Change-Id: I722d4802df34caf71a9dc0db1a3df8b76acb9de6
Reviewed-on: https://gerrit.libreoffice.org/78789
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file_misc.cxx | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 8ecc59299265..1690ca884dda 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -617,7 +617,38 @@ oslFileError SAL_CALL osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrD oslFileError SAL_CALL osl_replaceFile(rtl_uString* ustrFileURL, rtl_uString* ustrDestURL) { - return osl_moveFile(ustrFileURL, ustrDestURL); + int nGid = -1; + char destPath[PATH_MAX]; + oslFileError eRet = FileURLToPath(destPath, PATH_MAX, ustrDestURL); + if (eRet == osl_File_E_None) + { + struct stat aFileStat; + int nRet = stat(destPath, &aFileStat); + if (nRet == -1) + { + nRet = errno; + SAL_INFO("sal.file", "stat(" << destPath << "): " << UnixErrnoString(nRet)); + } + else + { + nGid = aFileStat.st_gid; + } + } + + eRet = osl_moveFile(ustrFileURL, ustrDestURL); + + if (eRet == osl_File_E_None && nGid != -1) + { + int nRet = chown(destPath, -1, nGid); + if (nRet == -1) + { + nRet = errno; + SAL_INFO("sal.file", + "chown(" << destPath << "-1, " << nGid << "): " << UnixErrnoString(nRet)); + } + } + + return eRet; } oslFileError SAL_CALL osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL ) |