Merge pull request #7828 from nextcloud/bugfix/unicode-paths

fix deletion of .lnk files on Windows with paths containing special characters
nextcloud · Feb 10, 2025 · 0c2fdb7 · 0c2fdb7
2 parents ffa8228 + 179c80e
commit 0c2fdb7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/common/filesystembase.cpp b/src/common/filesystembase.cpp
@@ -121,10 +121,10 @@ void FileSystem::setFileReadOnly(const QString &filename, bool readonly)
             std::filesystem::perms allWritePermissions = std::filesystem::perms::_All_write;
             static std::filesystem::perms defaultWritePermissions = std::filesystem::perms::others_write;
 
-            std::filesystem::permissions(filename.toStdString(), allWritePermissions, std::filesystem::perm_options::remove);
+            std::filesystem::permissions(filename.toStdWString(), allWritePermissions, std::filesystem::perm_options::remove);
 
             if (!readonly) {
-                std::filesystem::permissions(filename.toStdString(), defaultWritePermissions, std::filesystem::perm_options::add);
+                std::filesystem::permissions(filename.toStdWString(), defaultWritePermissions, std::filesystem::perm_options::add);
             }
         }
         catch (const std::filesystem::filesystem_error &e)
@@ -370,15 +370,15 @@ bool FileSystem::openAndSeekFileSharedRead(QFile *file, QString *errorOrNull, qi
 #ifdef Q_OS_WIN
 std::filesystem::perms FileSystem::filePermissionsWin(const QString &filename)
 {
-    return std::filesystem::status(filename.toStdString()).permissions();
+    return std::filesystem::status(filename.toStdWString()).permissions();
 }
 
 void FileSystem::setFilePermissionsWin(const QString &filename, const std::filesystem::perms &perms)
 {
     if (!fileExists(filename)) {
         return;
     }
-    std::filesystem::permissions(filename.toStdString(), perms);
+    std::filesystem::permissions(filename.toStdWString(), perms);
 }
 
 static bool fileExistsWin(const QString &filename)