i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Of course I did not get this right on first try... the targetDevice

Browse Source 
was taken from sourceDirectory, and fs_read_index_dir does not set
errno when returning NULL (i.e. no more index entry), which resulted
in the logic to think an error happened, but it only carried over from
fs_create_index() when the index already existed. I think lsindex
needs to be fixed as well, since it checks errno after
fs_read_index_dir(). In case fs_read_index_dir() is supposed to set
errno, it should reset it internally before it's possible to encounter
any error.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40820 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2011-03-05 17:37:24 +00:00
parent 8775d8d25d
commit df4e063a13
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/installer/WorkerThread.cpp
+5 -14
View File
@@ -483,7 +483,7 @@ WorkerThread::_MirrorIndices(const BPath& sourceDirectory,
dev_t sourceDevice = dev_for_path(sourceDirectory.Path()); dev_t sourceDevice = dev_for_path(sourceDirectory.Path());
if (sourceDevice < 0) if (sourceDevice < 0)
return (status_t)sourceDevice; return (status_t)sourceDevice;
dev_t targetDevice = dev_for_path(sourceDirectory.Path()); dev_t targetDevice = dev_for_path(targetDirectory.Path());
if (targetDevice < 0) if (targetDevice < 0)
return (status_t)targetDevice; return (status_t)targetDevice;
DIR* indices = fs_open_index_dir(sourceDevice); DIR* indices = fs_open_index_dir(sourceDevice);
@@ -497,19 +497,10 @@ WorkerThread::_MirrorIndices(const BPath& sourceDirectory,
errno, strerror(errno)); errno, strerror(errno));
return errno; return errno;
} }
while (true) { while (dirent* index = fs_read_index_dir(indices)) {
dirent* index = fs_read_index_dir(indices); if (strcmp(index->d_name, "name") == 0
if (index == NULL) { || strcmp(index->d_name, "size") == 0
if (errno != B_ENTRY_NOT_FOUND && errno != B_OK) { || strcmp(index->d_name, "last_modified") == 0) {
printf("%s: fs_read_index_dir: (%d) %s\n",
sourceDirectory.Path(), errno, strerror(errno));
return errno;
}
break;
}
if (!strcmp(index->d_name, "name")
|| !strcmp(index->d_name, "size")
|| !strcmp(index->d_name, "last_modified")) {
continue; continue;
} }