From 4ea318b347b2ca2ce41fcf504c48afe9f01e6c2a Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 3 Jun 2024 23:47:47 +0300
Subject: [PATCH] kioslave: do not add the filename if it is dot in file slave

KFileItem was doing that magic prior to
c18bacba12105b6b5345fd61b71d27ddca55043a

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kio/kio/kfileitem.cpp       |  3 ---
 kioslave/file/file_unix.cpp | 26 ++++++--------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp
index 1ac2747d..dd43b593 100644
--- a/kio/kio/kfileitem.cpp
+++ b/kio/kio/kfileitem.cpp
@@ -60,9 +60,6 @@ static bool isKDirShare(const QString &dirpath)
     return kdirsharereply.value();
 }
 
-// avoid creating these QStrings again and again
-static const QLatin1String s_dot = QLatin1String(".");
-
 class KFileItemPrivate : public QSharedData
 {
 public:
diff --git a/kioslave/file/file_unix.cpp b/kioslave/file/file_unix.cpp
index d83d6a47..f97a65ee 100644
--- a/kioslave/file/file_unix.cpp
+++ b/kioslave/file/file_unix.cpp
@@ -65,6 +65,8 @@ using namespace KIO;
 
 #define MAX_IPC_SIZE (1024*32)
 
+static const QLatin1String s_dot = QLatin1String(".");
+
 static bool same_inode(const KDE_struct_stat &src, const KDE_struct_stat &dest)
 {
     if (src.st_ino == dest.st_ino && src.st_dev == dest.st_dev) {
@@ -347,22 +349,6 @@ void FileProtocol::listDir(const KUrl &url)
         return;
     }
 
-    /*
-        set the current dir to the path to speed up
-        in not having to pass an absolute path.
-        We restore the path later to get out of the
-        path - the kernel wouldn't unmount or delete
-        directories we keep as active directory. And
-        as the slave runs in the background, it's hard
-        to see for the user what the problem would be
-    */
-    const QString pathBuffer(QDir::currentPath());
-    if (!QDir::setCurrent(path)) {
-        closedir(dp);
-        error(ERR_CANNOT_ENTER_DIRECTORY, path);
-        return;
-    }
-
     const QString sDetails = metaData(QLatin1String("details"));
     const int details = (sDetails.isEmpty() ? 2 : sDetails.toInt());
     //kDebug(7101) << "========= LIST " << url << "details=" << details << " =========";
@@ -376,7 +362,10 @@ void FileProtocol::listDir(const KUrl &url)
         entry.clear();
 
         const QString filename = QFile::decodeName(ep->d_name);
-        const QString filepath = path + QDir::separator() + filename;
+        QString filepath = path + QDir::separator();
+        if (filename != s_dot) {
+            filepath += filename;
+        }
         if (createUDSEntry(filename, filepath, entry, details)) {
             listEntry(entry, false);
         }
@@ -385,9 +374,6 @@ void FileProtocol::listDir(const KUrl &url)
     closedir(dp);
     listEntry(entry, true); // ready
 
-    // Restore the path
-    QDir::setCurrent(pathBuffer);
-
     finished();
 }