diff options
| author | dzwdz | 2023-06-10 17:47:16 +0200 |
|---|---|---|
| committer | dzwdz | 2023-06-10 17:47:16 +0200 |
| commit | 17fe7bc9c8311f7e192385e47550607e61874528 (patch) | |
| tree | 2e64187a886fa88c652e5df5e6b8e36e34609f7e /src/kernel | |
| parent | ede58f88397ad32f4d573d17811279735e2e386a (diff) | |
kernel: implement DUP_SEARCH (like unix's F_DUPFD)
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/proc.c | 9 | ||||
| -rw-r--r-- | src/kernel/proc.h | 5 | ||||
| -rw-r--r-- | src/kernel/syscalls.c | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/kernel/proc.c b/src/kernel/proc.c index 108a006..ecbd839 100644 --- a/src/kernel/proc.c +++ b/src/kernel/proc.c @@ -484,6 +484,9 @@ Proc *proc_next(Proc *p, Proc *root) { } hid_t proc_find_free_handle(Proc *proc, hid_t start_at) { + if (start_at < 0) { + start_at = 0; + } for (hid_t hid = start_at; hid < HANDLE_MAX; hid++) { if (proc->_handles[hid] == NULL) return hid; @@ -526,11 +529,11 @@ hid_t proc_handle_init(Proc *p, enum handle_type type, Handle **hs) { return hid; } -hid_t proc_handle_dup(Proc *p, hid_t from, hid_t to) { +hid_t proc_handle_dup(Proc *p, hid_t from, hid_t to, int flags) { Handle *fromh, **toh; - if (to < 0) { - to = proc_find_free_handle(p, 0); + if (to < 0 || (flags & DUP_SEARCH)) { + to = proc_find_free_handle(p, to); if (to < 0) return -EMFILE; } else if (to >= HANDLE_MAX) { return -EBADF; diff --git a/src/kernel/proc.h b/src/kernel/proc.h index bf5db69..f473124 100644 --- a/src/kernel/proc.h +++ b/src/kernel/proc.h @@ -129,10 +129,9 @@ Proc *proc_next(Proc *p, Proc *root); hid_t proc_find_free_handle(Proc *proc, hid_t start_at); Handle *proc_handle_get(Proc *, hid_t); hid_t proc_handle_init(Proc *, enum handle_type, Handle **); -hid_t proc_handle_dup(Proc *p, hid_t from, hid_t to); +hid_t proc_handle_dup(Proc *p, hid_t from, hid_t to, int flags); static inline void proc_handle_close(Proc *p, hid_t hid) { - // TODO test - proc_handle_dup(p, -1, hid); + proc_handle_dup(p, -1, hid, 0); } /* Gets a handle and removes the process' reference to it, without decreasing the refcount. diff --git a/src/kernel/syscalls.c b/src/kernel/syscalls.c index 03d9ef1..1e75f9d 100644 --- a/src/kernel/syscalls.c +++ b/src/kernel/syscalls.c @@ -177,8 +177,7 @@ fail: } hid_t _sys_dup(hid_t from, hid_t to, int flags) { - if (flags != 0) SYSCALL_RETURN(-ENOSYS); - SYSCALL_RETURN(proc_handle_dup(proc_cur, from, to)); + SYSCALL_RETURN(proc_handle_dup(proc_cur, from, to, flags)); } static long simple_vfsop( |