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

Switched to opendir() and friends instead of directly calling VFS functions.

Browse Source 
Now correctly ignores "." and ".." in a directory.
Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7895 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-11 00:56:26 +00:00
parent 15190e07b3
commit 80c27b7a53
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/drivers/dev.c
+19 -13
View File
@@ -14,7 +14,10 @@
#include <Errors.h> #include <Errors.h>
#include <devfs.h> #include <devfs.h>
#include <Drivers.h> #include <Drivers.h>
#include <memheap.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifdef ARCH_x86 #ifdef ARCH_x86
# include <arch/x86/console_dev.h> # include <arch/x86/console_dev.h>
@@ -28,33 +31,36 @@
* These are mainly here to allow testing and this needs to be revisited * These are mainly here to allow testing and this needs to be revisited
*/ */
const char *device_paths[] = { const char *device_paths[] = {
"/boot/beos/system/add-ons/kernel/drivers/dev",
"/boot/beos/system/add-ons/kernel/drivers/dev/audio",
"/boot/beos/system/add-ons/kernel/drivers/dev/misc",
"/boot/beos/system/add-ons/kernel/drivers/dev/net",
"/boot/drivers/dev", "/boot/drivers/dev",
"/boot/drivers/dev/audio",
"/boot/drivers/dev/misc",
"/boot/drivers/dev/net",
NULL NULL
}; };
int dev_init(kernel_args *ka)
int
dev_init(kernel_args *ka)
{ {
int fd;
const char **ptr; const char **ptr;
dprintf("dev_init: entry\n"); dprintf("dev_init: entry\n");
for (ptr = device_paths; (*ptr); ptr++) { for (ptr = device_paths; (*ptr); ptr++) {
fd = sys_open_dir(*ptr); DIR *dir = opendir(*ptr);
if (fd >= 0) { if (dir != NULL) {
ssize_t len; struct dirent *dirent;
char buf[SYS_MAX_NAME_LEN + sizeof(struct dirent) + 1];
struct dirent *dirent = (struct dirent *)buf; while ((dirent = readdir(dir)) != NULL) {
if (!strcmp(dirent->d_name, ".") || !strcmp(dirent->d_name, ".."))
continue;
while ((len = sys_read_dir(fd, dirent, sizeof(buf), 1)) > 0) {
dprintf("loading '%s' dev module\n", dirent->d_name); dprintf("loading '%s' dev module\n", dirent->d_name);
dev_load_dev_module(dirent->d_name, *ptr); dev_load_dev_module(dirent->d_name, *ptr);
dprintf("loaded dev module!\n"); dprintf("loaded dev module!\n");
} }
sys_close(fd); closedir(dir);
} }
} }