Fix various issues

[wimlib] / src / mount.c

diff --git a/src/mount.c b/src/mount.c
index 6bdd0c459e183f6607c79f3444add204cedf130f..82abe7d90b4640e29742facfcd6aac0539bb9ba2 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -196,7 +196,7 @@ static void remove_ads(struct dentry *dentry,
 
        wimlib_assert(dentry->resolved);
 
-       lte = lte_decrement_refcnt(lte, lookup_table);
+       lte = lte_decrement_refcnt(ads_entry->lte, lookup_table);
        if (lte)
                list_del(&ads_entry->lte_group_list.list);
        dentry_remove_ads(dentry, ads_entry);
@@ -214,16 +214,17 @@ int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf)
        else
                stbuf->st_mode = S_IFREG | 0644;
 
-       stbuf->st_ino = (ino_t)dentry->hard_link;
+       stbuf->st_ino = (ino_t)dentry->link_group_id;
 
        stbuf->st_nlink = dentry_link_group_size(dentry);
        stbuf->st_uid   = getuid();
        stbuf->st_gid   = getgid();
 
        /* Use the size of the unnamed (default) file stream. */
-       lte = dentry_first_lte_resolved(dentry);
+       lte = dentry_unnamed_lte_resolved(dentry);
        if (lte) {
                if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+                       wimlib_assert(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE);
                        wimlib_assert(lte->staging_file_name);
                        struct stat native_stat;
                        if (stat(lte->staging_file_name, &native_stat) != 0) {
@@ -310,7 +311,6 @@ static int create_staging_file(char **name_ret, int open_flags)
 static struct lookup_table_entry *
 lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group)
 {
-       int ret;
        u16 num_transferred_fds;
        struct lookup_table_entry *new_lte;
 
@@ -321,7 +321,7 @@ lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group)
        num_transferred_fds = 0;
        for (u16 i = 0; i < old_lte->num_allocated_fds; i++)
                if (old_lte->fds[i] && old_lte->fds[i]->dentry &&
-                   old_lte->fds[i]->dentry->hard_link == link_group)
+                   old_lte->fds[i]->dentry->link_group_id == link_group)
                        num_transferred_fds++;
        DEBUG("Transferring %u file descriptors",
              num_transferred_fds);
@@ -332,7 +332,7 @@ lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group)
        }
        for (u16 i = 0, j = 0; ; i++) {
                if (old_lte->fds[i] && old_lte->fds[i]->dentry &&
-                   old_lte->fds[i]->dentry->hard_link == link_group) {
+                   old_lte->fds[i]->dentry->link_group_id == link_group) {
                        struct wimlib_fd *fd = old_lte->fds[i];
                        old_lte->fds[i] = NULL;
                        fd->lte = new_lte;
@@ -384,7 +384,7 @@ static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte,
                do {
                        struct dentry *d;
                        d = container_of(pos, struct dentry, link_group_list);
-                       wimlib_assert(d->hard_link == dentry->hard_link);
+                       wimlib_assert(d->link_group_id == dentry->link_group_id);
                        lte_transfer_dentry(new_lte, d);
                        pos = pos->next;
                } while (pos != &dentry->link_group_list);
@@ -466,7 +466,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
                        new_lte = old_lte;
                } else {
                        DEBUG("Splitting lookup table entry "
-                             "(link_group_size = %u, lte refcnt = %u)",
+                             "(link_group_size = %zu, lte refcnt = %u)",
                              link_group_size, old_lte->refcnt);
                        /* Split a hard link group away from the "lookup table
                         * entry" hard link group (i.e. we had two hard link
@@ -483,7 +483,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
                         * XXX*/
                        wimlib_assert(old_lte->refcnt > link_group_size);
 
-                       new_lte = lte_extract_fds(old_lte, dentry->hard_link);
+                       new_lte = lte_extract_fds(old_lte, dentry->link_group_id);
                        if (!new_lte) {
                                ret = -ENOMEM;
                                goto out_delete_staging_file;
@@ -861,8 +861,6 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity)
                if (ret != 0)
                        return ret;
        }
-       if (ret != 0)
-               return ret;
 
        xml_update_image_info(w, w->current_image);
 
@@ -983,8 +981,6 @@ static int wimfs_ftruncate(const char *path, off_t size,
  */
 static int wimfs_getattr(const char *path, struct stat *stbuf)
 {
-       const char *stream_name;
-       char *p = NULL;
        struct dentry *dentry;
        int ret;
 
@@ -1009,7 +1005,7 @@ static int wimfs_getxattr(const char *path, const char *name, char *value,
        if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
-       if (memcmp(name, "user.", 5) != 0)
+       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
                return -ENOATTR;
        name += 5;
 
@@ -1027,7 +1023,7 @@ static int wimfs_getxattr(const char *path, const char *name, char *value,
                return res_size;
        if (res_size > size)
                return -ERANGE;
-       ret = read_full_wim_resource(lte, value);
+       ret = read_full_wim_resource(lte, (u8*)value);
        if (ret != 0)
                return -EIO;
        return res_size;
@@ -1142,7 +1138,7 @@ static int wimfs_mkdir(const char *path, mode_t mode)
        newdir = new_dentry(basename);
        newdir->attributes |= FILE_ATTRIBUTE_DIRECTORY;
        newdir->resolved = true;
-       newdir->hard_link = next_link_group_id++;
+       newdir->link_group_id = next_link_group_id++;
        link_dentry(newdir, parent);
        return 0;
 }
@@ -1152,7 +1148,6 @@ static int wimfs_mkdir(const char *path, mode_t mode)
 static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 {
        const char *stream_name;
-       const char *file_name;
        if ((mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
             && (stream_name = path_stream_name(path))) {
                /* Make an alternate data stream */
@@ -1193,7 +1188,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
                if (!dentry)
                        return -ENOMEM;
                dentry->resolved = true;
-               dentry->hard_link = next_link_group_id++;
+               dentry->link_group_id = next_link_group_id++;
                dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
                INIT_LIST_HEAD(&dentry->lte_group_list.list);
                link_dentry(dentry, parent);
@@ -1207,7 +1202,6 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 {
        struct dentry *dentry;
        struct lookup_table_entry *lte;
-       u8 *dentry_hash;
        int ret;
        struct wimlib_fd *fd;
        unsigned stream_idx;
@@ -1325,7 +1319,8 @@ static int wimfs_read(const char *path, char *buf, size_t size,
 
                size = min(size, res_entry->original_size - offset);
 
-               if (read_wim_resource(fd->lte, buf, size, offset, false) != 0)
+               if (read_wim_resource(fd->lte, (u8*)buf,
+                                     size, offset, false) != 0)
                        return -EIO;
                return size;
        }
@@ -1375,7 +1370,6 @@ static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
 /* Close a file. */
 static int wimfs_release(const char *path, struct fuse_file_info *fi)
 {
-       int ret;
        struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
 
        if (!fd) {
@@ -1410,11 +1404,10 @@ static int wimfs_removexattr(const char *path, const char *name)
 {
        struct dentry *dentry;
        struct ads_entry *ads_entry;
-       int ret;
        if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
-       if (memcmp(name, "user.", 5) != 0)
+       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
                return -ENOATTR;
        name += 5;
 
@@ -1525,12 +1518,14 @@ static int wimfs_setxattr(const char *path, const char *name,
        struct lookup_table_entry *existing_lte;
        struct lookup_table_entry *lte;
        u8 value_hash[SHA1_HASH_SIZE];
-       int ret;
-       int fd;
 
        if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
+       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+               return -ENOATTR;
+       name += 5;
+
        dentry = get_dentry(w, path);
        if (!dentry)
                return -ENOENT;
@@ -1547,7 +1542,7 @@ static int wimfs_setxattr(const char *path, const char *name,
        if (!new_ads_entry)
                return -ENOMEM;
 
-       sha1_buffer(value, size, value_hash);
+       sha1_buffer((const u8*)value, size, value_hash);
 
        existing_lte = __lookup_resource(w->lookup_table, value_hash);
 
@@ -1555,7 +1550,7 @@ static int wimfs_setxattr(const char *path, const char *name,
                lte = existing_lte;
                lte->refcnt++;
        } else {
-               char *value_copy;
+               u8 *value_copy;
                lte = new_lookup_table_entry();
                if (!lte)
                        return -ENOMEM;
@@ -1564,6 +1559,7 @@ static int wimfs_setxattr(const char *path, const char *name,
                        FREE(lte);
                        return -ENOMEM;
                }
+               memcpy(value_copy, value, size);
                lte->resource_location            = RESOURCE_IN_ATTACHED_BUFFER;
                lte->attached_buffer              = value_copy;
                lte->resource_entry.original_size = size;
@@ -1598,7 +1594,7 @@ static int wimfs_symlink(const char *to, const char *from)
 
        dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
        dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
-       dentry->hard_link = next_link_group_id++;
+       dentry->link_group_id = next_link_group_id++;
 
        if (dentry_set_symlink(dentry, to, w->lookup_table, &lte) != 0)
                goto out_free_dentry;
@@ -1656,7 +1652,6 @@ static int wimfs_unlink(const char *path)
        struct dentry *dentry;
        struct lookup_table_entry *lte;
        int ret;
-       u8 *dentry_hash;
        unsigned stream_idx;
        
        ret = lookup_resource(w, path, get_lookup_flags(), &dentry,
@@ -1775,7 +1770,7 @@ static int check_lte_refcnt(struct lookup_table_entry *lte, void *ignore)
                struct stream_list_head *head;
                WARNING("The following lookup table entry has a reference count "
                      "of %u, but", lte->refcnt);
-               WARNING("We found %u references to it", lte_group_size);
+               WARNING("We found %zu references to it", lte_group_size);
                next = lte->lte_group_list.next;
                head = container_of(next, struct stream_list_head, list);
                if (head->type == STREAM_TYPE_NORMAL) {
@@ -1824,7 +1819,7 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
 
        DEBUG("Selected image %d", image);
 
-       next_link_group_id = assign_link_groups(wim->image_metadata[image - 1].lgt);
+       next_link_group_id = assign_link_group_ids(wim->image_metadata[image - 1].lgt);
 
        /* Resolve all the lookup table entries of the dentry tree */
        for_dentry_in_tree(wim_root_dentry(wim), dentry_resolve_ltes,