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

* CopyEngine::Start() didn't return something at the end of the function

Browse Source 
* 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
This commit is contained in:
Stephan Aßmus
2007-09-06 23:02:41 +00:00
parent 8a10c0b5a7
commit c4650bba52
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/installer/CopyEngine.cpp
+6 -3
View File
@@ -232,6 +232,8 @@ The installer will have to reboot your machine if you proceed.", "OK", "Cancel",
BMessage msg(INSTALL_FINISHED); BMessage msg(INSTALL_FINISHED);
BMessenger(fWindow).SendMessage(&msg); BMessenger(fWindow).SendMessage(&msg);
return B_OK;
} }
@@ -247,8 +249,10 @@ CopyEngine::CopyFolder(BDirectory &srcDir, BDirectory &targetDir)
Undo undo; Undo undo;
if (S_ISDIR(statbuf.st_mode)) { if (S_ISDIR(statbuf.st_mode)) {
char name[B_FILE_NAME_LENGTH]; char name[B_FILE_NAME_LENGTH];
if (strcmp(name, PACKAGES_DIRECTORY) == 0) if (entry.GetName(name) == B_OK
&& strcmp(name, PACKAGES_DIRECTORY) == 0) {
continue; continue;
}
err = FSCopyFolder(&entry, &targetDir, fControl, NULL, false, undo); err = FSCopyFolder(&entry, &targetDir, fControl, NULL, false, undo);
} else { } else {
err = FSCopyFile(&entry, &statbuf, &targetDir, fControl, NULL, false, undo); err = FSCopyFile(&entry, &statbuf, &targetDir, fControl, NULL, false, undo);
@@ -281,8 +285,7 @@ CopyEngine::ScanDisksPartitions(BMenu *srcMenu, BMenu *targetMenu)
void void
CopyEngine::SetPackagesList(BList *list) CopyEngine::SetPackagesList(BList *list)
{ {
if (fPackages) delete fPackages;
delete fPackages;
fPackages = list; fPackages = list;
} }