mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 06:45:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Discovery: Distinguish readdir and closedir errors

Browse source
This commit is contained in:
Christian Kamm 2019-10-07 14:58:31 +02:00 committed by Kevin Ottens
parent 390af4d41b
commit 9d422284af
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libsync/discoveryphase.cpp
View file

@ -247,9 +247,13 @@ void DiscoverySingleLocalDirectoryJob::run() {
emit finishedFatalError(errorString);
return;
}
errno = 0;
QVector<LocalInfo> results;
while (auto dirent = csync_vio_local_readdir(dh, _vfs)) {
while (true) {
errno = 0;
auto dirent = csync_vio_local_readdir(dh, _vfs);
if (!dirent)
break;
if (dirent->type == ItemTypeSkip)
continue;
LocalInfo i;
@ -279,13 +283,21 @@ void DiscoverySingleLocalDirectoryJob::run() {
i.type = dirent->type;
results.push_back(i);
}
csync_vio_local_closedir(dh);
if (errno != 0) {
csync_vio_local_closedir(dh);
// Note: Windows vio converts any error into EACCES
qCWarning(lcDiscovery) << "readdir failed for file in " << localPath << " - errno: " << errno;
emit finishedFatalError(tr("Error while reading directory %1").arg(localPath));
return;
}
errno = 0;
csync_vio_local_closedir(dh);
if (errno != 0) {
qCWarning(lcDiscovery) << "closedir failed for file in " << localPath << " - errno: " << errno;
}
emit finished(results);
}