From c4650bba52bf7d7e68f5cc9839f93ae83c667954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 6 Sep 2007 23:02:41 +0000 Subject: [PATCH] * CopyEngine::Start() didn't return something at the end of the function * CopyEngine::CopyFolder() forgot to GetName(name) before using "name" in strcmp() * "delete" already checks for NULL git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22196 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/installer/CopyEngine.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/apps/installer/CopyEngine.cpp b/src/apps/installer/CopyEngine.cpp index e94b914374..2ad987a354 100644 --- a/src/apps/installer/CopyEngine.cpp +++ b/src/apps/installer/CopyEngine.cpp @@ -232,6 +232,8 @@ The installer will have to reboot your machine if you proceed.", "OK", "Cancel", BMessage msg(INSTALL_FINISHED); BMessenger(fWindow).SendMessage(&msg); + + return B_OK; } @@ -247,8 +249,10 @@ CopyEngine::CopyFolder(BDirectory &srcDir, BDirectory &targetDir) Undo undo; if (S_ISDIR(statbuf.st_mode)) { char name[B_FILE_NAME_LENGTH]; - if (strcmp(name, PACKAGES_DIRECTORY) == 0) + if (entry.GetName(name) == B_OK + && strcmp(name, PACKAGES_DIRECTORY) == 0) { continue; + } err = FSCopyFolder(&entry, &targetDir, fControl, NULL, false, undo); } else { err = FSCopyFile(&entry, &statbuf, &targetDir, fControl, NULL, false, undo); @@ -281,8 +285,7 @@ CopyEngine::ScanDisksPartitions(BMenu *srcMenu, BMenu *targetMenu) void CopyEngine::SetPackagesList(BList *list) { - if (fPackages) - delete fPackages; + delete fPackages; fPackages = list; }