Remove link_dentry()

[wimlib] / src / mount.c

diff --git a/src/mount.c b/src/mount.c
index ed428fca58907d1b943fb51b7590cbd934c92ace..e10287a6f58aa918aaa06852ba31b9a3ab1d5e25 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -185,7 +185,7 @@ static int alloc_wimlib_fd(struct inode *inode,
                        inode->num_opened_fds++;
                        if (lte)
                                lte->num_opened_fds++;
-                       DEBUG("Allocated fd");
+                       DEBUG("Allocated fd (idx = %u)", fd->idx);
                        return 0;
                }
        }
@@ -193,11 +193,11 @@ static int alloc_wimlib_fd(struct inode *inode,
 
 static void inode_put_fd(struct inode *inode, struct wimlib_fd *fd)
 {
-       wimlib_assert(fd);
-       wimlib_assert(inode);
+       wimlib_assert(fd != NULL);
+       wimlib_assert(inode != NULL);
        wimlib_assert(fd->f_inode == inode);
-       wimlib_assert(inode->num_opened_fds);
-       wimlib_assert(fd->idx < inode->num_opened_fds);
+       wimlib_assert(inode->num_opened_fds != 0);
+       wimlib_assert(fd->idx < inode->num_allocated_fds);
        wimlib_assert(inode->fds[fd->idx] == fd);
 
        inode->fds[fd->idx] = NULL;
@@ -746,6 +746,28 @@ static int wimfs_access(const char *path, int mask)
        return 0;
 }
 
+static int wimfs_chmod(const char *path, mode_t mask)
+{
+       struct dentry *dentry;
+       struct wimfs_context *ctx = wimfs_get_context();
+       struct inode *inode;
+       struct stat stbuf;
+       int ret;
+
+       ret = lookup_resource(ctx->wim, path,
+                             get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK,
+                             &dentry, NULL, NULL);
+       if (ret != 0)
+               return ret;
+       inode = dentry->d_inode;
+       inode_to_stbuf(inode, NULL, &stbuf);
+       if (mask == stbuf.st_mode)
+               return 0;
+       else
+               return -EPERM;
+
+}
+
 static void inode_update_lte_ptr(struct inode *inode,
                                 struct lookup_table_entry *old_lte,
                                 struct lookup_table_entry *new_lte)
@@ -1064,7 +1086,7 @@ static int wimfs_link(const char *to, const char *from)
                        lte->refcnt++;
        }
 
-       link_dentry(from_dentry, from_dentry_parent);
+       dentry_add_child(from_dentry_parent, from_dentry);
        return 0;
 }
 
@@ -1130,7 +1152,7 @@ static int wimfs_mkdir(const char *path, mode_t mode)
        newdir->d_inode->attributes |= FILE_ATTRIBUTE_DIRECTORY;
        newdir->d_inode->resolved = true;
        newdir->d_inode->ino = ctx->next_ino++;
-       link_dentry(newdir, parent);
+       dentry_add_child(parent, newdir);
        return 0;
 }
 
@@ -1182,7 +1204,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
                        return -ENOMEM;
                dentry->d_inode->resolved = true;
                dentry->d_inode->ino = ctx->next_ino++;
-               link_dentry(dentry, parent);
+               dentry_add_child(parent, dentry);
        }
        return 0;
 }
@@ -1469,7 +1491,7 @@ static int wimfs_rename(const char *from, const char *to)
        src->file_name_utf8_len = file_name_utf8_len;
 
        unlink_dentry(src);
-       link_dentry(src, parent_of_dst);
+       dentry_add_child(parent_of_dst, src);
        return 0;
 }
 
@@ -1589,7 +1611,7 @@ static int wimfs_symlink(const char *to, const char *from)
        if (inode_set_symlink(inode, to, ctx->wim->lookup_table, NULL) != 0)
                goto out_free_dentry;
 
-       link_dentry(dentry, dentry_parent);
+       dentry_add_child(dentry_parent, dentry);
        return 0;
 out_free_dentry:
        free_dentry(dentry);
@@ -1747,6 +1769,7 @@ static int wimfs_write(const char *path, const char *buf, size_t size,
 
 static struct fuse_operations wimfs_operations = {
        .access      = wimfs_access,
+       .chmod       = wimfs_chmod,
        .destroy     = wimfs_destroy,
 #if 0
        .fallocate   = wimfs_fallocate,