summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-08 12:30:41 (UTC)
committer zautrix <zautrix>2004-08-08 12:30:41 (UTC)
commit75138e84a2271f8929478853151a6ed4a73fb2cc (patch) (side-by-side diff)
tree804b3277bf2e4c4e371611677481803f527bf90e
parent4cc869512488b72304c7cbb5526c6f4cc957e677 (diff)
downloadkdepimpi-75138e84a2271f8929478853151a6ed4a73fb2cc.zip
kdepimpi-75138e84a2271f8929478853151a6ed4a73fb2cc.tar.gz
kdepimpi-75138e84a2271f8929478853151a6ed4a73fb2cc.tar.bz2
Fixed kdirwatch
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--microkde/kio/kio/kdirwatch.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/microkde/kio/kio/kdirwatch.cpp b/microkde/kio/kio/kdirwatch.cpp
index 98d24e0..1596d1f 100644
--- a/microkde/kio/kio/kdirwatch.cpp
+++ b/microkde/kio/kio/kdirwatch.cpp
@@ -566,65 +566,66 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const QString& _path,
for(Entry* dep=e->m_entries.first();dep;dep=e->m_entries.next())
if (!dep->isDir) { mask |= DN_MODIFY|DN_ATTRIB; break; }
if( fcntl(e->dn_fd, F_NOTIFY, mask) < 0) { // shouldn't happen
::close(e->dn_fd);
e->m_mode = UnknownMode;
fd_Entry.remove(e->dn_fd);
e->dn_fd = 0;
useStat( e );
}
}
#endif
}
else {
(*it).addClient(instance);
kdDebug(7001) << "Added already watched Entry " << path
<< " (now " << (*it).clients() << " clients)"
<< QString(" [%1]").arg(instance->name()) << endl;
}
return;
}
// we have a new path to watch
struct stat stat_buf;
bool exists = (stat(QFile::encodeName(path), &stat_buf) == 0);
Entry newEntry;
m_mapEntries.insert( path, newEntry );
// the insert does a copy, so we have to use <e> now
Entry* e = &(m_mapEntries[path]);
if (exists) {
- e->isDir = S_ISDIR(stat_buf.st_mode);
+ QFileInfo fi ( path );
+ e->isDir = fi.isDir();
if (e->isDir && !isDir)
qWarning("KDirWatch: %s is a directory. Use addDir!", path.ascii());
else if (!e->isDir && isDir)
qWarning("KDirWatch: %s is a file. Use addFile!", path.ascii());
e->m_ctime = stat_buf.st_ctime;
e->m_status = Normal;
e->m_nlink = stat_buf.st_nlink;
}
else {
e->isDir = isDir;
e->m_ctime = invalid_ctime;
e->m_status = NonExistent;
e->m_nlink = 0;
}
e->path = path;
if (sub_entry)
e->m_entries.append(sub_entry);
else
e->addClient(instance);
kdDebug(7001) << "Added " << (e->isDir ? "Dir ":"File ") << path
<< (e->m_status == NonExistent ? " NotExisting" : "")
<< (sub_entry ? QString(" for %1").arg(sub_entry->path) : QString(""))
<< (instance ? QString(" [%1]").arg(instance->name()) : QString(""))
<< endl;
// now setup the notification method
e->m_mode = UnknownMode;