X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/003db17f7a36a8098827f40df8fedc087b5a26f6..6fefc6f5af83f316e18b0cb9dbbde1cea0b98add:/lunaix-os/kernel/fs/vfs.c?ds=sidebyside

diff --git a/lunaix-os/kernel/fs/vfs.c b/lunaix-os/kernel/fs/vfs.c
index 902f21e..09668f5 100644
--- a/lunaix-os/kernel/fs/vfs.c
+++ b/lunaix-os/kernel/fs/vfs.c
@@ -80,6 +80,9 @@ __dcache_get_bucket(struct v_dnode* parent, unsigned int hash)
 struct v_dnode*
 vfs_dcache_lookup(struct v_dnode* parent, struct hstr* str)
 {
+    if (!str->len)
+        return parent;
+
     struct hbucket* slot = __dcache_get_bucket(parent, str->hash);
 
     struct v_dnode *pos, *n;
@@ -109,7 +112,7 @@ vfs_walk(struct v_dnode* start,
     int errno = 0;
     int i = 0, j = 0;
 
-    if (path[0] == PATH_DELIM) {
+    if (path[0] == PATH_DELIM || !start) {
         if ((walk_options & VFS_WALK_FSRELATIVE) && start) {
             start = start->super_block->root;
         } else {
@@ -146,6 +149,7 @@ vfs_walk(struct v_dnode* start,
         }
 
         name_content[j] = 0;
+        name.len = j;
         hstr_rehash(&name, HSTR_FULL_HASH);
 
         if (!lookahead && (walk_options & VFS_WALK_PARENT)) {
@@ -200,6 +204,7 @@ vfs_walk(struct v_dnode* start,
 error:
     vfree(dnode->name.value);
     vfs_d_free(dnode);
+    *dentry = NULL;
     return errno;
 }
 
@@ -381,11 +386,15 @@ __DEFINE_LXSYSCALL2(int, open, const char*, path, int, options)
         return -1;
     }
 
+    vfs_walk(dentry, name.value, &file, NULL, 0);
+
     struct v_file* opened_file = 0;
-    if (!(file = vfs_dcache_lookup(dentry, &name)) && (options & FO_CREATE)) {
-        errno = dentry->inode->ops.create(dentry->inode, opened_file);
-    } else if (!file) {
-        errno = EEXIST;
+    if (!file) {
+        if ((options & FO_CREATE)) {
+            errno = dentry->inode->ops.create(dentry->inode, opened_file);
+        } else {
+            errno = ENOENT;
+        }
     } else {
         errno = vfs_open(file, &opened_file);
     }
@@ -395,21 +404,25 @@ __DEFINE_LXSYSCALL2(int, open, const char*, path, int, options)
     if (!errno && !(errno = vfs_alloc_fdslot(&fd))) {
         struct v_fd* fd_s = vzalloc(sizeof(*fd_s));
         fd_s->file = opened_file;
-        fd_s->pos = file->inode->fsize & -((options & FO_APPEND) == 0);
+        fd_s->pos = file->inode->fsize & -((options & FO_APPEND) != 0);
         __current->fdtable->fds[fd] = fd_s;
     }
 
     return SYSCALL_ESTATUS(errno);
 }
 
+#define GET_FD(fd, fd_s)                                                       \
+    (fd >= 0 && fd < VFS_MAX_FD && (fd_s = __current->fdtable->fds[fd]))
+
 __DEFINE_LXSYSCALL1(int, close, int, fd)
 {
     struct v_fd* fd_s;
     int errno;
-    if (fd < 0 || fd >= VFS_MAX_FD || !(fd_s = __current->fdtable->fds[fd])) {
+    if (!GET_FD(fd, fd_s)) {
         errno = EBADF;
     } else if (!(errno = vfs_close(fd_s->file))) {
         vfree(fd_s);
+        __current->fdtable->fds[fd] = 0;
     }
 
     __current->k_status = errno;
@@ -424,7 +437,7 @@ __vfs_readdir_callback(struct dir_context* dctx,
                        const int dtype)
 {
     struct dirent* dent = (struct dirent*)dctx->cb_data;
-    strcpy(dent->d_name, name);
+    strncpy(dent->d_name, name, DIRENT_NAME_MAX_LEN);
     dent->d_nlen = len;
     dent->d_type = dtype;
 }
@@ -433,7 +446,7 @@ __DEFINE_LXSYSCALL2(int, readdir, int, fd, struct dirent*, dent)
 {
     struct v_fd* fd_s;
     int errno;
-    if (fd < 0 || fd >= VFS_MAX_FD || !(fd_s = __current->fdtable->fds[fd])) {
+    if (!GET_FD(fd, fd_s)) {
         errno = EBADF;
     } else if (!(fd_s->file->inode->itype & VFS_INODE_TYPE_DIR)) {
         errno = ENOTDIR;
@@ -456,8 +469,7 @@ __DEFINE_LXSYSCALL1(int, mkdir, const char*, path)
 {
     struct v_dnode *parent, *dir;
     struct hstr component = HSTR(valloc(VFS_NAME_MAXLEN), 0);
-    int errno =
-      vfs_walk(root_sb->root, path, &parent, &component, VFS_WALK_PARENT);
+    int errno = vfs_walk(NULL, path, &parent, &component, VFS_WALK_PARENT);
     if (errno) {
         goto done;
     }
@@ -478,6 +490,71 @@ __DEFINE_LXSYSCALL1(int, mkdir, const char*, path)
     }
 
 done:
+    __current->k_status = errno;
+    return SYSCALL_ESTATUS(errno);
+}
+
+__DEFINE_LXSYSCALL3(int, read, int, fd, void*, buf, size_t, count)
+{
+    int errno = 0;
+    struct v_fd* fd_s;
+    if (!GET_FD(fd, fd_s)) {
+        errno = EBADF;
+    } else {
+        struct v_file* file = fd_s->file;
+        file->f_pos = fd_s->pos;
+        if ((errno = file->ops.read(file, buf, count)) >= 0) {
+            fd_s->pos += errno;
+        }
+    }
+
+    __current->k_status = errno;
+    return SYSCALL_ESTATUS(errno);
+}
+
+__DEFINE_LXSYSCALL3(int, write, int, fd, void*, buf, size_t, count)
+{
+    int errno = 0;
+    struct v_fd* fd_s;
+    if (!GET_FD(fd, fd_s)) {
+        errno = EBADF;
+    } else {
+        struct v_file* file = fd_s->file;
+        file->f_pos = fd_s->pos;
+        if ((errno = file->ops.write(file, buf, count)) >= 0) {
+            fd_s->pos += errno;
+        }
+    }
+
+    __current->k_status = errno;
+    return SYSCALL_ESTATUS(errno);
+}
+
+__DEFINE_LXSYSCALL3(int, lseek, int, fd, int, offset, int, options)
+{
+    int errno = 0;
+    struct v_fd* fd_s;
+    if (!GET_FD(fd, fd_s)) {
+        errno = EBADF;
+    } else {
+        size_t fpos = fd_s->file->f_pos;
+        switch (options) {
+            case FSEEK_CUR:
+                fpos = (size_t)((int)fd_s->file->f_pos + offset);
+                break;
+            case FSEEK_END:
+                fpos = (size_t)((int)fd_s->file->inode->fsize + offset);
+                break;
+            case FSEEK_SET:
+                fpos = offset;
+                break;
+
+            default:
+                break;
+        }
+        fd_s->pos = fpos;
+    }
+
     __current->k_status = errno;
     return SYSCALL_ESTATUS(errno);
 }
\ No newline at end of file