feat: refine symbolic link support.

[lunaix-os.git] / lunaix-os / kernel / fs / vfs.c

diff --git a/lunaix-os/kernel/fs/vfs.c b/lunaix-os/kernel/fs/vfs.c
index 8a4a8a17e0a9f148f0307e2b6f32f43b27d0558f..7959fc3ffc3cce0cc58d79ec40ec777666480e5f 100644 (file)
--- a/lunaix-os/kernel/fs/vfs.c
+++ b/lunaix-os/kernel/fs/vfs.c
@@ -515,6 +515,7 @@ vfs_i_free(struct v_inode* inode)
 /* ---- System call definition and support ---- */
 
 #define FLOCATE_CREATE_EMPTY 1
 /* ---- System call definition and support ---- */
 
 #define FLOCATE_CREATE_EMPTY 1

+#define FLOCATE_CREATE_ONLY 2

 
 int
 vfs_getfd(int fd, struct v_fd** fd_s)
 
 int
 vfs_getfd(int fd, struct v_fd** fd_s)


@@ -541,7 +542,13 @@ __vfs_try_locate_file(const char* path,
     }
 
     errno = vfs_walk(*fdir, name.value, file, NULL, 0);
     }
 
     errno = vfs_walk(*fdir, name.value, file, NULL, 0);

-    if (errno != ENOENT || !(options & FLOCATE_CREATE_EMPTY)) {
+
+    if (errno != ENOENT && (options & FLOCATE_CREATE_ONLY)) {
+        return EEXIST;
+    }
+
+    if (errno != ENOENT ||
+        !(options & (FLOCATE_CREATE_EMPTY | FLOCATE_CREATE_ONLY))) {

         return errno;
     }
 
         return errno;
     }
 


@@ -1201,25 +1208,26 @@ __DEFINE_LXSYSCALL2(int,
                     link_target)
 {
     int errno;
                     link_target)
 {
     int errno;

-    struct v_dnode* dnode;
-    if ((errno = vfs_walk_proc(pathname, &dnode, NULL, 0))) {
+    struct v_dnode *dnode, *file;
+    if ((errno = __vfs_try_locate_file(
+           pathname, &dnode, &file, FLOCATE_CREATE_ONLY))) {

         goto done;
     }
 
         goto done;
     }
 

-    if (errno = vfs_check_writable(dnode)) {
+    if (errno = vfs_check_writable(file)) {

         goto done;
     }
 
         goto done;
     }
 

-    if (!dnode->inode->ops->set_symlink) {
+    if (!file->inode->ops->set_symlink) {

         errno = ENOTSUP;
         goto done;
     }
 
         errno = ENOTSUP;
         goto done;
     }
 

-    lock_inode(dnode->inode);
+    lock_inode(file->inode);

 
 

-    errno = dnode->inode->ops->set_symlink(dnode->inode, link_target);
+    errno = file->inode->ops->set_symlink(file->inode, link_target);

 
 

-    unlock_inode(dnode->inode);
+    unlock_inode(file->inode);

 
 done:
     return DO_STATUS(errno);
 
 done:
     return DO_STATUS(errno);


@@ -1322,7 +1330,7 @@ __DEFINE_LXSYSCALL2(char*, getcwd, char*, buf, size_t, size)
         }
     }
 
         }
     }
 

-    buf[len + 1] = '\0';
+    buf[len] = '\0';

 
     ret_ptr = buf;
 
 
     ret_ptr = buf;