diff options
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file_misc.cxx | 5 | ||||
| -rw-r--r-- | sal/osl/w32/file.cxx | 34 | ||||
| -rw-r--r-- | sal/util/sal.map | 5 |
3 files changed, 44 insertions, 0 deletions
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 7e3386cfa4e5..8126a4db23d0 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -603,6 +603,11 @@ oslFileError SAL_CALL osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrD return oslDoMoveFile( srcPath, destPath ); } +oslFileError SAL_CALL osl_replaceFile(rtl_uString* ustrFileURL, rtl_uString* ustrDestURL) +{ + return osl_moveFile(ustrFileURL, ustrDestURL); +} + oslFileError SAL_CALL osl_copyFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL ) { char srcPath[PATH_MAX]; diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index aed1b315bb9e..b3f68ea94e32 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -1156,4 +1156,38 @@ oslFileError SAL_CALL osl_moveFile(rtl_uString* strPath, rtl_uString *strDestPat return error; } +oslFileError SAL_CALL osl_replaceFile(rtl_uString* strPath, rtl_uString* strDestPath) +{ + rtl_uString *strSysPath = nullptr, *strSysDestPath = nullptr; + oslFileError error = osl_getSystemPathFromFileURL_(strPath, &strSysPath, false); + + if (error == osl_File_E_None) + error = osl_getSystemPathFromFileURL_(strDestPath, &strSysDestPath, false); + + if (error == osl_File_E_None) + { + LPCWSTR src = o3tl::toW(rtl_uString_getStr(strSysPath)); + LPCWSTR dst = o3tl::toW(rtl_uString_getStr(strSysDestPath)); + + if (!ReplaceFileW(dst, src, nullptr, + REPLACEFILE_WRITE_THROUGH | REPLACEFILE_IGNORE_MERGE_ERRORS + | REPLACEFILE_IGNORE_ACL_ERRORS, + nullptr, nullptr)) + { + DWORD dwError = GetLastError(); + if (dwError == ERROR_FILE_NOT_FOUND) // no strDestPath file? + error = osl_moveFile(strPath, strDestPath); + else + error = oslTranslateFileError(dwError); + } + } + + if (strSysPath) + rtl_uString_release(strSysPath); + if (strSysDestPath) + rtl_uString_release(strSysDestPath); + + return error; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/util/sal.map b/sal/util/sal.map index 86ad07525ee6..e5c8cdb58fc5 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -707,6 +707,11 @@ LIBO_UDK_5.3 { # symbols available in >= LibO 5.3 rtl_uString_newReplaceFirstUtf16LUtf16L; } LIBO_UDK_5.2; +LIBO_UDK_6.1 { # symbols available in >= LibO 6.1 + global: + osl_replaceFile; +} LIBO_UDK_5.3; + PRIVATE_1.0 { global: osl_detail_ObjectRegistry_storeAddresses; |