X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/6f6da1abb22dff69dbb710bd2fd9d95f083f2b43..34f6af4f61e0eec9c96113e07f140b609b4113c8:/lunaix-os/kernel/fs/path_walk.c diff --git a/lunaix-os/kernel/fs/path_walk.c b/lunaix-os/kernel/fs/path_walk.c index d376c79..84e04d0 100644 --- a/lunaix-os/kernel/fs/path_walk.c +++ b/lunaix-os/kernel/fs/path_walk.c @@ -6,6 +6,7 @@ #include #define VFS_SYMLINK_DEPTH 16 +#define VFS_SYMLINK_MAXLEN 512 extern struct lru_zone *dnode_lru, *inode_lru; @@ -31,7 +32,7 @@ __vfs_walk(struct v_dnode* start, } else { start = vfs_sysroot; if (!vfs_sysroot->mnt) { - panick("vfs: no root"); + fail("vfs: no root"); } } @@ -119,21 +120,28 @@ __vfs_walk(struct v_dnode* start, current_level = dnode; current_inode = current_level->inode; - if ((current_inode->itype & F_MSLNK) && + assert(current_inode); + + if (check_symlink_node(current_inode) && !(walk_options & VFS_WALK_NOFOLLOW)) { const char* link; + struct v_inode_ops* iops; - if (!current_inode->ops->read_symlink) { + iops = current_inode->ops; + + if (!iops->read_symlink) { errno = ENOTSUP; goto error; } lock_inode(current_inode); - if ((errno = - current_inode->ops->read_symlink(current_inode, &link))) { + + errno = iops->read_symlink(current_inode, &link); + if ((errno < 0)) { unlock_inode(current_inode); goto error; } + unlock_inode(current_inode); errno = __vfs_walk(current_level->parent, @@ -173,6 +181,11 @@ vfs_walk(struct v_dnode* start, struct hstr* component, int options) { + if (!path) { + *dentry = NULL; + return 0; + } + // allocate a file name stack for path walking and recursion to resolve // symlink char* name_buffer = valloc(2048);