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

App Server: Refactor Accelerant add-on loading

Browse Source 
... to use BPathFinder instead of iterating through each of the
(current) add-on directories.

Update copyright header, add myself to authors.

add an ATRACE() of the path once it is found.
This commit is contained in:
John Scipione
2014-06-29 17:31:08 -04:00
parent a4a7b1f48b
commit 8127947b30
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
+15 -16
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2012, Haiku. * Copyright 2001-2014 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -7,6 +7,7 @@
* DarkWyrm, [email protected] * DarkWyrm, [email protected]
* Axel Dörfler, [email protected] * Axel Dörfler, [email protected]
* Michael Lotz, [email protected] * Michael Lotz, [email protected]
* John Scipione, [email protected]
*/ */
@@ -34,7 +35,9 @@
#include <Accelerant.h> #include <Accelerant.h>
#include <Cursor.h> #include <Cursor.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <PathFinder.h>
#include <String.h> #include <String.h>
#include <StringList.h>
#include "AccelerantBuffer.h" #include "AccelerantBuffer.h"
#include "MallocBuffer.h" #include "MallocBuffer.h"
@@ -277,25 +280,21 @@ AccelerantHWInterface::_OpenAccelerant(int device)
ATRACE(("accelerant signature is: %s\n", signature)); ATRACE(("accelerant signature is: %s\n", signature));
struct stat accelerant_stat;
const static directory_which dirs[] = {
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_SYSTEM_ADDONS_DIRECTORY
};
fAccelerantImage = -1; fAccelerantImage = -1;
for (uint32 i = 0; i < sizeof(dirs) / sizeof(directory_which); i++) { BString leafPath("/accelerants/");
char path[PATH_MAX]; leafPath << signature;
if (find_directory(dirs[i], -1, false, path, PATH_MAX) != B_OK) BStringList addOnPaths;
BPathFinder::FindPaths(B_FIND_PATH_ADD_ONS_DIRECTORY, leafPath.String(),
addOnPaths);
int32 count = addOnPaths.CountStrings();
for (int32 i = 0; i < count; i++) {
const char* path = addOnPaths.StringAt(i).String();
struct stat accelerantStat;
if (stat(path, &accelerantStat) != 0)
continue; continue;
strcat(path, "/accelerants/"); ATRACE(("accelerant path is: %s\n", path));
strcat(path, signature);
if (stat(path, &accelerant_stat) != 0)
continue;
fAccelerantImage = load_add_on(path); fAccelerantImage = load_add_on(path);
if (fAccelerantImage >= 0) { if (fAccelerantImage >= 0) {