Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kioslave: do not add the filename if it is dot in file slave

Browse source 
KFileItem was doing that magic prior to
c18bacba12

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-06-03 23:47:47 +03:00
parent 7b48bfbca1
commit 4ea318b347
2 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kio/kio/kfileitem.cpp
View file

@ -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:

26
kioslave/file/file_unix.cpp
View file

@ -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();
}