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

Converted module.c to use sys_read_dir() instead of sys_read(). But it really

Browse Source 
should use opendir(), and readdir().


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@60 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2002-07-10 21:48:27 +00:00
parent c1f7f96bbf
commit 65dc706027
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/module.c
+17 -16
View File
@@ -425,34 +425,35 @@ static int recurse_check_file(const char *filepath, const char *srcfile)
*/ */
static int recurse_directory(const char *path, const char *match) static int recurse_directory(const char *path, const char *match)
{ {
/* ToDo: should just use opendir(), readdir(), ... */
struct stat stat; struct stat stat;
int res = 0, file; int res = 0, dir;
char *name; int bufferSize = sizeof(struct dirent) + SYS_MAX_NAME_LEN + 1;
struct dirent *dirent;
if ((file = sys_open(path, STREAM_TYPE_DIR, 0)) < 0) { if ((dir = sys_open(path, STREAM_TYPE_DIR, 0)) < 0)
return -1; return -1;
}
dirent = kmalloc(bufferSize);
name = (char*)kmalloc(SYS_MAX_NAME_LEN); if (!dirent)
if (!name)
return -1; return -1;
/* loop until we have a match or we run out of entries */ /* loop until we have a match or we run out of entries */
while (res <= 0) { while (res <= 0) {
char *newpath; char *newpath;
size_t slen = 0; size_t slen = 0;
SHOW_FLOW(3, "scanning %s\n", path); SHOW_FLOW(3, "scanning %s\n", path);
name[0] = '\0'; if ((res = sys_read_dir(dir, dirent, bufferSize, 1)) <= 0)
if ((res = sys_read(file, name, 0, SYS_MAX_NAME_LEN)) <= 0) {
break; break;
}
slen = strlen(path) + strlen(name) + 2; dirent->d_name[dirent->d_reclen] = '\0';
slen = strlen(path) + strlen(dirent->d_name) + 2;
newpath = (char*)kmalloc(slen); newpath = (char*)kmalloc(slen);
strlcpy(newpath, path, slen); strlcpy(newpath, path, slen);
strlcat(newpath, "/", slen); strlcat(newpath, "/", slen);
strlcat(newpath, name, slen); strlcat(newpath, dirent->d_name, slen);
if ((res = sys_rstat(newpath, &stat)) != B_NO_ERROR) { if ((res = sys_rstat(newpath, &stat)) != B_NO_ERROR) {
kfree(newpath); kfree(newpath);
@@ -481,9 +482,9 @@ static int recurse_directory(const char *path, const char *match)
kfree(newpath); kfree(newpath);
} }
kfree(name); kfree(dirent);
sys_close(file); sys_close(dir);
return res; return res;
} }