diff options
author | Anton Kling <anton@kling.gg> | 2023-11-17 21:24:33 +0100 |
---|---|---|
committer | Anton Kling <anton@kling.gg> | 2023-11-17 21:27:26 +0100 |
commit | 99e5c8e046dfff53c331eb35394bfbcab4629fd0 (patch) | |
tree | 690994f164306688bfb3346f218c79301c0f0452 /kernel/fs | |
parent | 6723c96863425bda541e321127f6944bf008446a (diff) |
Kernel: Add isatty syscall
Diffstat (limited to 'kernel/fs')
-rw-r--r-- | kernel/fs/shm.c | 2 | ||||
-rw-r--r-- | kernel/fs/tmpfs.c | 6 | ||||
-rw-r--r-- | kernel/fs/vfs.c | 7 | ||||
-rw-r--r-- | kernel/fs/vfs.h | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/kernel/fs/shm.c b/kernel/fs/shm.c index a77702a..2224cc2 100644 --- a/kernel/fs/shm.c +++ b/kernel/fs/shm.c @@ -81,7 +81,7 @@ int shm_open(const char *name, int oflag, mode_t mode) { NULL /*stat*/); vfs_fd_t *fd_ptr; - int fd = vfs_create_fd(oflag, mode, inode, &fd_ptr); + int fd = vfs_create_fd(oflag, mode, 0/*is_tty*/, inode, &fd_ptr); if (-1 == fd) { kfree(inode); return -EMFILE; diff --git a/kernel/fs/tmpfs.c b/kernel/fs/tmpfs.c index 0e82a16..d213005 100644 --- a/kernel/fs/tmpfs.c +++ b/kernel/fs/tmpfs.c @@ -52,7 +52,7 @@ void dual_pipe(int fd[2]) { assert(inode); vfs_fd_t *fd_ptr; - fd[i] = vfs_create_fd(O_RDWR | O_NONBLOCK, 0, inode, &fd_ptr); + fd[i] = vfs_create_fd(O_RDWR | O_NONBLOCK, 0, 0/*is_tty*/, inode, &fd_ptr); assert(-1 != fd[i]); } vfs_inode_t *f_inode = get_current_task()->file_descriptors[fd[0]]->inode; @@ -78,11 +78,11 @@ void pipe(int fd[2]) { 0 /*inode_num*/, 0 /*type*/, has_data, can_write, is_open, internal_object, 0 /*file_size*/, NULL /*open*/, NULL /*create_file*/, tmp_read, tmp_write, tmp_close, NULL /*create_directory*/, - NULL /*get_vm_object*/, NULL /*truncate*/, NULL/*stat*/); + NULL /*get_vm_object*/, NULL /*truncate*/, NULL /*stat*/); assert(inode); vfs_fd_t *fd_ptr; - fd[i] = vfs_create_fd(O_RDWR, 0, inode, &fd_ptr); + fd[i] = vfs_create_fd(O_RDWR, 0, 0 /*is_tty*/, inode, &fd_ptr); assert(-1 != fd[i]); } vfs_inode_t *f_inode = get_current_task()->file_descriptors[fd[0]]->inode; diff --git a/kernel/fs/vfs.c b/kernel/fs/vfs.c index d0c1b95..d55a2bf 100644 --- a/kernel/fs/vfs.c +++ b/kernel/fs/vfs.c @@ -54,7 +54,8 @@ vfs_inode_t *vfs_create_inode( return r; } -int vfs_create_fd(int flags, int mode, vfs_inode_t *inode, vfs_fd_t **fd) { +int vfs_create_fd(int flags, int mode, int is_tty, vfs_inode_t *inode, + vfs_fd_t **fd) { process_t *p = (process_t *)get_current_task(); int i; for (i = 0; i < 100; i++) @@ -67,6 +68,7 @@ int vfs_create_fd(int flags, int mode, vfs_inode_t *inode, vfs_fd_t **fd) { r->mode = mode; r->inode = inode; r->reference_count = 1; + r->is_tty = is_tty; r->offset = 0; p->file_descriptors[i] = r; if (fd) @@ -266,7 +268,8 @@ int vfs_open(const char *file, int flags, int mode) { return uds_open(resolved_path); } - return vfs_create_fd(flags, mode, inode, NULL); + // FIXME: Maybe it is sometimes a TTY? + return vfs_create_fd(flags, mode, 0 /*is_tty*/, inode, NULL); } int vfs_close(int fd) { diff --git a/kernel/fs/vfs.h b/kernel/fs/vfs.h index b6a3401..76c0a0c 100644 --- a/kernel/fs/vfs.h +++ b/kernel/fs/vfs.h @@ -47,6 +47,7 @@ struct vfs_fd { size_t offset; int flags; int mode; + int is_tty; int reference_count; // Number of usages of this file descriptor, // once it reaches zero then the contents can // be freed. @@ -84,7 +85,8 @@ vfs_vm_object_t *vfs_get_vm_object(int fd, u64 length, u64 offset); int vfs_dup2(int org_fd, int new_fd); vfs_inode_t *vfs_internal_open(const char *file); int vfs_mkdir(const char *path, int mode); -int vfs_create_fd(int flags, int mode, vfs_inode_t *inode, vfs_fd_t **fd); +int vfs_create_fd(int flags, int mode, int is_tty, vfs_inode_t *inode, + vfs_fd_t **fd); int vfs_ftruncate(int fd, size_t length); int vfs_chdir(const char *path); int vfs_fstat(int fd, struct stat *buf); |