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

Fixed a bug that would have considered /boot/trashy_file be in /boot/trash.

Browse Source 
Spotted by Rene, thanks!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39805 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2010-12-10 15:26:27 +00:00
parent 1e4538de6f
commit 784263e28a
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/mail/DeskbarView.cpp
+7 -4
View File
@@ -131,10 +131,13 @@ bool DeskbarView::_EntryInTrash(const entry_ref* entry)
BPath trashPath; BPath trashPath;
BPath entryPath(entry); BPath entryPath(entry);
BVolume volume(entry->device); BVolume volume(entry->device);
if (volume.InitCheck() == B_OK) { if (volume.InitCheck() == B_OK
find_directory(B_TRASH_DIRECTORY, &trashPath, false, &volume); && find_directory(B_TRASH_DIRECTORY, &trashPath, false,
if (strncmp(entryPath.Path(), trashPath.Path(), &volume) == B_OK) {
strlen(trashPath.Path())) == 0) char path[PATH_MAX];
strncpy(path, trashPath.Path(), sizeof(path));
strncat(path, "/", sizeof(path));
if (strncmp(entryPath.Path(), path, strlen(path)) == 0)
return true; return true;
} }
src/servers/mail/main.cpp
+7 -4
View File
@@ -638,10 +638,13 @@ MailDaemonApp::_IsEntryInTrash(BEntry& entry)
BPath trashPath; BPath trashPath;
BPath entryPath(&entry); BPath entryPath(&entry);
BVolume volume(ref.device); BVolume volume(ref.device);
if (volume.InitCheck() == B_OK) { if (volume.InitCheck() == B_OK
find_directory(B_TRASH_DIRECTORY, &trashPath, false, &volume); && find_directory(B_TRASH_DIRECTORY, &trashPath,
if (strncmp(entryPath.Path(), trashPath.Path(), false, &volume) == B_OK) {
strlen(trashPath.Path())) == 0) char path[PATH_MAX];
strncpy(path, trashPath.Path(), sizeof(path));
strncat(path, "/", sizeof(path));
if (strncmp(entryPath.Path(), path, strlen(path)) == 0)
return true; return true;
} }