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

Use find_directory() in the devfs. Based on patch by Vasilis Kaoutsis.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25503 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-05-15 10:06:58 +00:00
parent 9194faef55
commit 2764548ef3
1 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/devfs.cpp
+55 -18
View File
@@ -25,6 +25,7 @@
#include <boot_device.h> #include <boot_device.h>
#include <debug.h> #include <debug.h>
#include <elf.h> #include <elf.h>
#include <FindDirectory.h>
#include <kdevice_manager.h> #include <kdevice_manager.h>
#include <KPath.h> #include <KPath.h>
#include <lock.h> #include <lock.h>
@@ -490,14 +491,26 @@ unpublish_driver(driver_entry *driver)
static int32 static int32
get_priority(const char *path) get_priority(const char* path)
{ {
// TODO: use find_directory() // TODO: would it be better to initialize a static structure here
const char *kPaths[] = {"/boot/beos", "/boot/common", "/boot/home", NULL}; // using find_directory()?
const directory_which whichPath[] = {
B_BEOS_DIRECTORY,
B_COMMON_DIRECTORY,
B_USER_DIRECTORY
};
KPath pathBuffer;
for (int32 i = 0; kPaths[i] != NULL; i++) { for (uint32 index = 0; index < sizeof(whichPath) / sizeof(whichPath[0]);
if (!strncmp(kPaths[i], path, strlen(kPaths[i]))) index++) {
return i; if (find_directory(whichPath[index], gBootDevice, false,
pathBuffer.LockBuffer(), pathBuffer.BufferSize()) == B_OK) {
pathBuffer.UnlockBuffer();
if (!strncmp(pathBuffer.Path(), path, pathBuffer.BufferSize()))
return index;
} else
pathBuffer.UnlockBuffer();
} }
return -1; return -1;
@@ -2835,21 +2848,45 @@ driver_module_info gDeviceForDriversModule = {
extern "C" void extern "C" void
devfs_add_preloaded_drivers(kernel_args* args) devfs_add_preloaded_drivers(kernel_args* args)
{ {
// NOTE: This function does not exit in case of error, since it
// needs to unload the images then. Also the return code of
// the path operations is kept separate from the add_driver()
// success, so that even if add_driver() fails for one driver, it
// is still tried for the other drivers.
// NOTE: The initialization success of the path objects is implicitely
// checked by the immediately following functions.
KPath basePath;
status_t pathStatus = find_directory(B_BEOS_ADDONS_DIRECTORY,
gBootDevice, false, basePath.LockBuffer(), basePath.BufferSize());
if (pathStatus != B_OK) {
dprintf("devfs_add_preloaded_drivers: find_directory() failed: "
"%s\n", strerror(pathStatus));
}
basePath.UnlockBuffer();
if (pathStatus == B_OK)
pathStatus = basePath.Append("kernel");
if (pathStatus != B_OK) {
dprintf("devfs_add_preloaded_drivers: constructing base driver "
"path failed: %s\n", strerror(pathStatus));
}
struct preloaded_image* image; struct preloaded_image* image;
for (image = args->preloaded_images; image != NULL; image = image->next) { for (image = args->preloaded_images; image != NULL; image = image->next) {
if (!image->is_module && image->id >= 0) { if (image->is_module || image->id < 0)
// fake an absolute path continue;
char path[B_PATH_NAME_LENGTH];
strlcpy(path, "/boot/beos/system/add-ons/kernel/", sizeof(path));
strlcat(path, image->name, sizeof(path));
// try to add the driver KPath imagePath(basePath);
status_t error = add_driver(path, image->id); if (pathStatus == B_OK)
if (error != B_OK) { pathStatus = imagePath.Append(image->name);
dprintf("devfs_add_preloaded_drivers: Failed to add \"%s\"\n",
image->name); // try to add the driver
unload_kernel_add_on(image->id); status_t addStatus = pathStatus;
} if (pathStatus == B_OK)
addStatus = add_driver(imagePath.Path(), image->id);
if (addStatus != B_OK) {
dprintf("devfs_add_preloaded_drivers: Failed to add \"%s\"\n",
image->name);
unload_kernel_add_on(image->id);
} }
} }
} }