sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-12 10:53:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fd wasn't returned in reorganised sys_open. Fixed.

Browse Source
This commit is contained in:
Bahadir Balban
2008-04-19 00:55:11 +01:00
parent 8c4c436925
commit ce26835968
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/fs0/main.c
View File

@@ -93,7 +93,7 @@ void handle_fs_requests(void)
(unsigned long)mr[2], (void *)mr[3]);
break;
default:
printf("%s: Unrecognised ipc tag (%d)"
printf("%s: Unrecognised ipc tag (%d) "
"received. Ignoring.\n", __TASKNAME__, mr[MR_TAG]);
}
}

6
tasks/fs0/src/syscalls.c
View File

@@ -129,6 +129,7 @@ int sys_open(l4id_t sender, const char *pathname, int flags, unsigned int mode)
/* Get a new fd */
BUG_ON((fd = id_new(task->fdpool)) < 0);
retval = fd;
/* Assign the new fd with the vnode's number */
task->fd[fd] = v->vnum;
@@ -339,6 +340,11 @@ int sys_readdir(l4id_t sender, int fd, void *buf, int count)
return 0;
}
if (fd < 0 || fd > TASK_OFILES_MAX) {
l4_ipc_return(-EBADF);
return 0;
}
/* Convert fd to vnum. */
BUG_ON((vnum = t->fd[fd]) < 0);

21
tasks/test0/src/dirtest.c
View File

@@ -111,14 +111,14 @@ int lsdir(char *path)
memset(dents, 0, sizeof(struct dirent) * DENTS_TOTAL);
if ((fd = open(path, O_RDONLY)) < 0) {
printf("OPEN failed.");
return 0;
printf("OPEN failed.\n");
return -1;
} else
printf("Got fd: %d for opening %s\n", fd, path);
if ((bytes = os_readdir(fd, dents, sizeof(struct dirent) * DENTS_TOTAL)) < 0) {
perror("GETDENTS\n");
return 0;
printf("GETDENTS error: %d\n", bytes);
return -1;
} else {
print_dirents(path, dents, bytes);
}
@@ -130,9 +130,15 @@ int lsdir(char *path)
int dirtest(void)
{
printf("\nlsdir current directory:\n");
lsdir(".");
if (lsdir(".") < 0) {
printf("lsdir failed.\n");
goto out_err;
}
printf("\nlsdir root directory:\n");
lsdir("/");
if (lsdir("/") < 0) {
printf("lsdir failed.\n");
goto out_err;
}
printf("\nCreating directories: usr, etc, tmp, var, home, opt, bin, boot, lib, dev\n");
if (mkdir("/usr", 0) < 0)
@@ -173,5 +179,8 @@ int dirtest(void)
printf("\nlsdir /usr/./././bin//\n");
lsdir("/usr/./././bin//");
return 0;
out_err:
return 0;
}