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

Now handles files at the root of the source volume. Fixes bug #1227

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21192 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-05-21 18:41:59 +00:00
parent f856bb2838
commit 7d2cc6a102
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/installer/CopyEngine.cpp
+11 -6
View File
@@ -241,13 +241,18 @@ CopyEngine::CopyFolder(BDirectory &srcDir, BDirectory &targetDir)
BEntry entry;
status_t err;
while (srcDir.GetNextEntry(&entry) == B_OK) {
char name[B_FILE_NAME_LENGTH];
entry.GetName(name);
if (strcmp(name, PACKAGES_DIRECTORY) == 0)
continue;
StatStruct statbuf;
entry.GetStat(&statbuf);
Undo undo;
err = FSCopyFolder(&entry, &targetDir, fControl, NULL, false, undo);
if (S_ISDIR(statbuf.st_mode)) {
char name[B_FILE_NAME_LENGTH];
if (strcmp(name, PACKAGES_DIRECTORY) == 0)
continue;
err = FSCopyFolder(&entry, &targetDir, fControl, NULL, false, undo);
} else {
err = FSCopyFile(&entry, &statbuf, &targetDir, fControl, NULL, false, undo);
}
if (err != B_OK) {
BPath path;
entry.GetPath(&path);