Ticket #2185: devfs.cpp.diff

src/system/kernel/fs/devfs.cpp

@@ -25 +25 @@
 #include <boot_device.h>
 #include <debug.h>
 #include <elf.h>
+#include <FindDirectory.h>
 #include <kdevice_manager.h>
 #include <KPath.h>
 #include <lock.h>
@@ -490 +491 @@
 
 
 static int32
-get_priority(const char *path)
+get_priority(const char* path)
 {
-    // TODO: use find_directory()
-    const char *kPaths[] = {"/boot/beos", "/boot/common", "/boot/home", NULL};
+    const directory_which whichPath[] = {
+        B_BEOS_DIRECTORY,
+        B_COMMON_DIRECTORY,
+        B_USER_DIRECTORY
+    };
+    KPath pathBuffer;
 
-    for (int32 i = 0; kPaths[i] != NULL; i++) {
-        if (!strncmp(kPaths[i], path, strlen(kPaths[i])))
-            return i;
+    for (uint32 index = 0; index < sizeof(whichPath) / sizeof(whichPath[0]); index++) {
+        if (find_directory(whichPath[index], gBootDevice, false,
+            pathBuffer.LockBuffer(), pathBuffer.BufferSize()) == B_OK) {
+            pathBuffer.UnlockBuffer();
+            if (!strncmp(pathBuffer.Path(), path, pathBuffer.BufferSize()))
+                return index;
+        }
     }
 
     return -1;
@@ -2837 +2846 @@
     struct preloaded_image* image;
     for (image = args->preloaded_images; image != NULL; image = image->next) {
         if (!image->is_module && image->id >= 0) {
-            // fake an absolute path
-            char path[B_PATH_NAME_LENGTH];
-            strlcpy(path, "/boot/beos/system/add-ons/kernel/", sizeof(path));
-            strlcat(path, image->name, sizeof(path));
+            KPath imagePath;
+            status_t status = find_directory(B_BEOS_ADDONS_DIRECTORY, gBootDevice, false,
+                imagePath.LockBuffer(), imagePath.BufferSize());
+            if (status < B_OK) {
+                dprintf("devfs_add_preloaded_drivers: Failed when find_directory \"%s\"\n",
+                    strerror(status));
+            } else {
+                imagePath.UnlockBuffer();
+                imagePath.Append("kernel/");
+                imagePath.Append(image->name);
+            }
 
             // try to add the driver
-            status_t error = add_driver(path, image->id);
-            if (error != B_OK) {
+            status = add_driver(imagePath.Path(), image->id);
+            if (status != B_OK) {
                 dprintf("devfs_add_preloaded_drivers: Failed to add \"%s\"\n",
                     image->name);
                 unload_kernel_add_on(image->id);