X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=66e668af6e0a2c0fda9d4a22f895d8687973726f;hp=2d0d56c65c1b96eeb9dbc4ad6f718eef68ecd698;hb=50ae56edcc3938f5183ddfc8910de2df5774eaf6;hpb=062465170ddb4520ca6fbc64a0f6e27e786de101 diff --git a/src/mount_image.c b/src/mount_image.c index 2d0d56c6..66e668af 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -160,6 +160,54 @@ flags_writable(int open_flags) return open_flags & (O_RDWR | O_WRONLY); } +/* Like pread(), but keep trying until everything has been read or we know for + * sure that there was an error. */ +static ssize_t +full_pread(int fd, void *buf, size_t count, off_t offset) +{ + ssize_t bytes_remaining = count; + ssize_t bytes_read; + + while (bytes_remaining > 0) { + bytes_read = pread(fd, buf, bytes_remaining, offset); + if (bytes_read <= 0) { + if (bytes_read < 0) { + if (errno == EINTR) + continue; + } else { + errno = EIO; + } + break; + } + bytes_remaining -= bytes_read; + buf += bytes_read; + offset += bytes_read; + } + return count - bytes_remaining; +} + +/* Like pwrite(), but keep trying until everything has been written or we know + * for sure that there was an error. */ +static ssize_t +full_pwrite(int fd, const void *buf, size_t count, off_t offset) +{ + ssize_t bytes_remaining = count; + ssize_t bytes_written; + + while (bytes_remaining > 0) { + bytes_written = pwrite(fd, buf, bytes_remaining, offset); + if (bytes_written < 0) { + if (errno == EINTR) + continue; + break; + } + bytes_remaining -= bytes_written; + buf += bytes_written; + offset += bytes_written; + } + return count - bytes_remaining; +} + /* * Allocate a file descriptor for a stream. * @@ -642,26 +690,14 @@ extract_resource_to_staging_dir(struct wim_inode *inode, } } - new_lte->refcnt = inode->i_nlink; - new_lte->resource_location = RESOURCE_IN_STAGING_FILE; - new_lte->staging_file_name = staging_file_name; - new_lte->lte_inode = inode; - - struct wim_lookup_table_entry **my_ptr; + new_lte->refcnt = inode->i_nlink; + new_lte->resource_location = RESOURCE_IN_STAGING_FILE; + new_lte->staging_file_name = staging_file_name; + new_lte->resource_entry.original_size = size; - if (stream_id == 0) { - my_ptr = &inode->i_lte; - } else { - for (u16 i = 0; ; i++) { - wimlib_assert(i < inode->i_num_ads); - if (inode->i_ads_entries[i].stream_id == stream_id) { - my_ptr = &inode->i_ads_entries[i].lte; - break; - } - } - } - - lookup_table_insert_unhashed(ctx->wim->lookup_table, new_lte, my_ptr); + lookup_table_insert_unhashed(ctx->wim->lookup_table, new_lte, + inode, stream_id); + *retrieve_lte_pointer(new_lte) = new_lte; *lte = new_lte; return 0; out_revert_fd_changes: @@ -802,21 +838,25 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags, wimlib_progress_func_t progress_func) { int ret; - struct wim_lookup_table_entry *lte; + struct wim_lookup_table_entry *lte, *tmp; WIMStruct *w = ctx->wim; struct wim_image_metadata *imd = wim_get_current_image_metadata(ctx->wim); DEBUG("Closing all staging file descriptors."); - image_for_each_unhashed_stream(lte, imd) { - ret = inode_close_fds(lte->lte_inode); + image_for_each_unhashed_stream_safe(lte, tmp, imd) { + ret = inode_close_fds(lte->back_inode); if (ret) return ret; } DEBUG("Freeing entries for zero-length streams"); - image_for_each_unhashed_stream(lte, imd) { + image_for_each_unhashed_stream_safe(lte, tmp, imd) { + wimlib_assert(lte->unhashed); if (wim_resource_size(lte) == 0) { - *lte->my_ptr = NULL; + struct wim_lookup_table_entry **back_ptr; + back_ptr = retrieve_lte_pointer(lte); + *back_ptr = NULL; + list_del(<e->unhashed_list); free_lookup_table_entry(lte); } } @@ -1501,13 +1541,6 @@ execute_fusermount(const char *dir) return 0; } -#if 0 -static int wimfs_access(const char *path, int mask) -{ - return -ENOSYS; -} -#endif - static int wimfs_chmod(const char *path, mode_t mask) { @@ -1569,17 +1602,6 @@ wimfs_destroy(void *p) } } -#if 0 -static int wimfs_fallocate(const char *path, int mode, - off_t offset, off_t len, struct fuse_file_info *fi) -{ - struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh; - wimlib_assert(fd->staging_fd != -1); - return fallocate(fd->staging_fd, mode, offset, len); -} - -#endif - static int wimfs_fgetattr(const char *path, struct stat *stbuf, struct fuse_file_info *fi) @@ -1813,18 +1835,22 @@ wimfs_open(const char *path, struct fuse_file_info *fi) u16 stream_idx; u32 stream_id; struct wimfs_context *ctx = wimfs_get_context(); + struct wim_lookup_table_entry **back_ptr; ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), &dentry, <e, &stream_idx); - if (ret != 0) + if (ret) return ret; inode = dentry->d_inode; - if (stream_idx == 0) + if (stream_idx == 0) { stream_id = 0; - else + back_ptr = &inode->i_lte; + } else { stream_id = inode->i_ads_entries[stream_idx - 1].stream_id; + back_ptr = &inode->i_ads_entries[stream_idx - 1].lte; + } /* The file resource may be in the staging directory (read-write mounts * only) or in the WIM. If it's in the staging directory, we need to @@ -1838,13 +1864,14 @@ wimfs_open(const char *path, struct fuse_file_info *fi) u64 size = (lte) ? wim_resource_size(lte) : 0; ret = extract_resource_to_staging_dir(inode, stream_id, <e, size, ctx); - if (ret != 0) + if (ret) return ret; + *back_ptr = lte; } ret = alloc_wimfs_fd(inode, stream_id, lte, &fd, wimfs_ctx_readonly(ctx)); - if (ret != 0) + if (ret) return ret; if (lte && lte->resource_location == RESOURCE_IN_STAGING_FILE) { @@ -1894,26 +1921,33 @@ wimfs_read(const char *path, char *buf, size_t size, if (!fd) return -EBADF; - if (!fd->f_lte) /* Empty stream with no lookup table entry */ + if (size == 0) return 0; - res_size = wim_resource_size(fd->f_lte); + if (fd->f_lte) + res_size = wim_resource_size(fd->f_lte); + else + res_size = 0; + if (offset > res_size) return -EOVERFLOW; - size = min(size, INT_MAX); + size = min(size, res_size - offset); + if (size == 0) + return 0; switch (fd->f_lte->resource_location) { case RESOURCE_IN_STAGING_FILE: - ret = pread(fd->staging_fd, buf, size, offset); - if (ret < 0) + ret = full_pread(fd->staging_fd, buf, size, offset); + if (ret != size) ret = -errno; break; case RESOURCE_IN_WIM: if (read_partial_wim_resource_into_buf(fd->f_lte, size, offset, buf, true)) ret = -errno; - ret = size; + else + ret = size; break; case RESOURCE_IN_ATTACHED_BUFFER: memcpy(buf, fd->f_lte->attached_buffer + offset, size); @@ -1990,10 +2024,16 @@ wimfs_readlink(const char *path, char *buf, size_t buf_len) return -errno; if (!inode_is_symlink(inode)) return -EINVAL; - - ret = inode_readlink(inode, buf, buf_len, ctx->wim, true); - if (ret > 0) + if (buf_len == 0) + return -ENAMETOOLONG; + ret = wim_inode_readlink(inode, buf, buf_len - 1); + if (ret >= 0) { + wimlib_assert(ret <= buf_len - 1); + buf[ret] = '\0'; ret = 0; + } else if (ret == -ENAMETOOLONG) { + buf[buf_len - 1] = '\0'; + } return ret; } @@ -2177,11 +2217,14 @@ wimfs_symlink(const char *to, const char *from) FILE_ATTRIBUTE_REPARSE_POINT, &dentry); if (ret == 0) { dentry->d_inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; - if (inode_set_symlink(dentry->d_inode, to, - wimfs_ctx->wim->lookup_table, NULL)) - { + ret = wim_inode_set_symlink(dentry->d_inode, to, + wimfs_ctx->wim->lookup_table); + if (ret) { remove_dentry(dentry, wimfs_ctx->wim->lookup_table); - ret = -ENOMEM; + if (ret == WIMLIB_ERR_NOMEM) + ret = -ENOMEM; + else + ret = -EIO; } } return ret; @@ -2209,24 +2252,29 @@ wimfs_truncate(const char *path, off_t size) if (lte == NULL && size == 0) return 0; - inode = dentry->d_inode; - if (stream_idx == 0) - stream_id = 0; - else - stream_id = inode->i_ads_entries[stream_idx - 1].stream_id; - if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { ret = truncate(lte->staging_file_name, size); - if (ret != 0) + if (ret) ret = -errno; + else + lte->resource_entry.original_size = size; } else { /* File in WIM. Extract it to the staging directory, but only * the first @size bytes of it. */ + struct wim_lookup_table_entry **back_ptr; + + inode = dentry->d_inode; + if (stream_idx == 0) { + stream_id = 0; + back_ptr = &inode->i_lte; + } else { + stream_id = inode->i_ads_entries[stream_idx - 1].stream_id; + back_ptr = &inode->i_ads_entries[stream_idx - 1].lte; + } ret = extract_resource_to_staging_dir(inode, stream_id, <e, size, ctx); + *back_ptr = lte; } - if (ret == 0) - lte->resource_entry.original_size = size; return ret; } @@ -2324,13 +2372,17 @@ wimfs_write(const char *path, const char *buf, size_t size, wimlib_assert(fd->f_inode != NULL); /* Write the data. */ - ret = pwrite(fd->staging_fd, buf, size, offset); - if (ret == -1) + ret = full_pwrite(fd->staging_fd, buf, size, offset); + if (ret != size) return -errno; /* Update file size */ - if (offset + size > fd->f_lte->resource_entry.original_size) + if (offset + size > fd->f_lte->resource_entry.original_size) { + DEBUG("Update file size %"PRIu64 " => %"PRIu64"", + fd->f_lte->resource_entry.original_size, + offset + size); fd->f_lte->resource_entry.original_size = offset + size; + } /* Update timestamps */ touch_inode(fd->f_inode); @@ -2338,15 +2390,9 @@ wimfs_write(const char *path, const char *buf, size_t size, } static struct fuse_operations wimfs_operations = { -#if 0 - .access = wimfs_access, -#endif .chmod = wimfs_chmod, .chown = wimfs_chown, .destroy = wimfs_destroy, -#if 0 - .fallocate = wimfs_fallocate, -#endif .fgetattr = wimfs_fgetattr, .ftruncate = wimfs_ftruncate, .getattr = wimfs_getattr, @@ -2444,6 +2490,10 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, goto out; } + ret = wim_checksum_unhashed_streams(wim); + if (ret) + goto out; + ret = select_wim_image(wim, image); if (ret) goto out; @@ -2478,7 +2528,6 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS))) mount_flags |= WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR; - DEBUG("Initializing struct wimfs_context"); init_wimfs_context(&ctx); ctx.wim = wim; @@ -2486,6 +2535,7 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, ctx.image_inode_list = &imd->inode_list; ctx.default_uid = getuid(); ctx.default_gid = getgid(); + wimlib_assert(list_empty(&imd->unhashed_streams)); ctx.wim->lookup_table->unhashed_streams = &imd->unhashed_streams; if (mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS) ctx.default_lookup_flags = LOOKUP_FLAG_ADS_OK; @@ -2554,10 +2604,8 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, #endif /* Mark dentry tree as modified if read-write mount. */ - if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { + if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) imd->modified = 1; - imd->has_been_mounted_rw = 1; - } /* Resolve the lookup table entries for every inode in the image, and * assign inode numbers */