diff options
| author | B. Stack <bgstack15@gmail.com> | 2023-10-28 08:29:29 -0400 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2023-10-28 08:29:29 -0400 |
| commit | d30e0825ff61e9d8bae68cdfd2798da0badcf255 (patch) | |
| tree | a55034c5f47324d2220e40639c6c632a895c5648 /zen/file_access.cpp | |
| parent | add upstream 13.0 (diff) | |
| download | FreeFileSync-d30e0825ff61e9d8bae68cdfd2798da0badcf255.tar.gz FreeFileSync-d30e0825ff61e9d8bae68cdfd2798da0badcf255.tar.bz2 FreeFileSync-d30e0825ff61e9d8bae68cdfd2798da0badcf255.zip | |
add upstream 13.113.1
Diffstat (limited to 'zen/file_access.cpp')
| -rw-r--r-- | zen/file_access.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/zen/file_access.cpp b/zen/file_access.cpp index af19df87..6a8a36da 100644 --- a/zen/file_access.cpp +++ b/zen/file_access.cpp @@ -273,16 +273,16 @@ void zen::removeDirectoryPlainRecursion(const Zstring& dirPath) //throw FileErro namespace { -std::wstring generateMoveErrorMsg(const Zstring& pathFrom, const Zstring& pathTo) +std::wstring generateMoveErrorMsg(const Zstring& pathFrom, const Zstring& pathTo) { - if (getParentFolderPath(pathFrom) == getParentFolderPath(pathTo)) //pure "rename" - return replaceCpy(replaceCpy(_("Cannot rename %x to %y."), - L"%x", fmtPath(pathFrom)), - L"%y", fmtPath(getItemName(pathTo))); - else //"move" or "move + rename" - return trimCpy(replaceCpy(replaceCpy(_("Cannot move %x to %y."), - L"%x", L'\n' + fmtPath(pathFrom)), - L"%y", L'\n' + fmtPath(pathTo))); + if (getParentFolderPath(pathFrom) == getParentFolderPath(pathTo)) //pure "rename" + return replaceCpy(replaceCpy(_("Cannot rename %x to %y."), + L"%x", fmtPath(pathFrom)), + L"%y", fmtPath(getItemName(pathTo))); + else //"move" or "move + rename" + return trimCpy(replaceCpy(replaceCpy(_("Cannot move %x to %y."), + L"%x", L'\n' + fmtPath(pathFrom)), + L"%y", L'\n' + fmtPath(pathTo))); } /* Usage overview: (avoid circular pattern!) @@ -732,11 +732,11 @@ FileCopyResult zen::copyNewFile(const Zstring& sourceFile, const Zstring& target return { - .fileSize = makeUnsigned(sourceInfo.st_size), + .fileSize = makeUnsigned(sourceInfo.st_size), .sourceModTime = sourceInfo.st_mtim, .sourceFileIdx = sourceInfo.st_ino, .targetFileIdx = targetFileIdx, - .errorModTime = errorModTime, + .errorModTime = errorModTime, }; } |