X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmount_image.c;h=7543b6e424b67770a7d35376b753f3e7b76386a1;hb=3ffb2cde078ae8f62d542ab89166e1059c13d758;hp=d54fd23671389adc861dc4db9e5309e0371e5bd3;hpb=297e0855665e45708b114048e42befc4654cdbee;p=wimlib diff --git a/src/mount_image.c b/src/mount_image.c index d54fd236..7543b6e4 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -46,7 +46,6 @@ #include "wimlib/paths.h" #include "wimlib/reparse.h" #include "wimlib/resource.h" -#include "wimlib/swm.h" #include "wimlib/timestamp.h" #include "wimlib/version.h" #include "wimlib/write.h" @@ -435,7 +434,7 @@ inode_to_stbuf(const struct wim_inode *inode, stbuf->st_ino = (ino_t)inode->i_ino; stbuf->st_nlink = inode->i_nlink; if (lte) - stbuf->st_size = wim_resource_size(lte); + stbuf->st_size = lte->size; else stbuf->st_size = 0; #ifdef HAVE_STAT_NANOSECOND_PRECISION @@ -483,7 +482,7 @@ create_staging_file(char **name_ret, struct wimfs_context *ctx) static const size_t STAGING_FILE_NAME_LEN = 20; name_len = ctx->staging_dir_name_len + 1 + STAGING_FILE_NAME_LEN; - name = MALLOC(name_len + 1); + name = MALLOC(name_len + 1); if (!name) { errno = ENOMEM; return -1; @@ -567,10 +566,10 @@ extract_resource_to_staging_dir(struct wim_inode *inode, /* Extract the stream to the staging file (possibly truncated) */ if (old_lte) { - struct filedes wimlib_fd = {.fd = fd}; - extract_size = min(wim_resource_size(old_lte), size); - ret = extract_wim_resource_to_fd(old_lte, &wimlib_fd, - extract_size); + struct filedes wimlib_fd; + filedes_init(&wimlib_fd, fd); + extract_size = min(old_lte->size, size); + ret = extract_stream_to_fd(old_lte, &wimlib_fd, extract_size); } else { ret = 0; extract_size = 0; @@ -663,10 +662,10 @@ 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->resource_entry.original_size = size; + new_lte->refcnt = inode->i_nlink; + new_lte->resource_location = RESOURCE_IN_STAGING_FILE; + new_lte->staging_file_name = staging_file_name; + new_lte->size = size; lookup_table_insert_unhashed(ctx->wim->lookup_table, new_lte, inode, stream_id); @@ -825,7 +824,7 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags, DEBUG("Freeing entries for zero-length streams"); image_for_each_unhashed_stream_safe(lte, tmp, imd) { wimlib_assert(lte->unhashed); - if (wim_resource_size(lte) == 0) { + if (lte->size == 0) { struct wim_lookup_table_entry **back_ptr; back_ptr = retrieve_lte_pointer(lte); *back_ptr = NULL; @@ -864,7 +863,7 @@ set_message_queue_names(struct wimfs_context *ctx, const char *mount_dir) char *p; int ret; - dir_path = realpath(mount_dir, NULL); + dir_path = realpath(mount_dir, NULL); if (!dir_path) { ERROR_WITH_ERRNO("Failed to resolve path \"%s\"", mount_dir); if (errno == ENOMEM) @@ -1539,8 +1538,8 @@ wimfs_chmod(const char *path, mode_t mask) if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA)) return -EPERM; - ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK, - &dentry, NULL, NULL); + ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK, + &dentry, NULL, NULL); if (ret) return ret; @@ -1560,8 +1559,8 @@ wimfs_chown(const char *path, uid_t uid, gid_t gid) if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA)) return -EPERM; - ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK, - &dentry, NULL, NULL); + ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK, + &dentry, NULL, NULL); if (ret) return ret; @@ -1606,7 +1605,7 @@ wimfs_ftruncate(const char *path, off_t size, struct fuse_file_info *fi) if (ret) return -errno; touch_inode(fd->f_inode); - fd->f_lte->resource_entry.original_size = size; + fd->f_lte->size = size; return 0; } @@ -1621,9 +1620,10 @@ wimfs_getattr(const char *path, struct stat *stbuf) int ret; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->wim, path, - get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK, - &dentry, <e, NULL); + ret = wim_pathname_to_stream(ctx->wim, path, + get_lookup_flags(ctx) | + LOOKUP_FLAG_DIRECTORY_OK, + &dentry, <e, NULL); if (ret != 0) return ret; return inode_to_stbuf(dentry->d_inode, lte, stbuf); @@ -1638,14 +1638,14 @@ wimfs_getxattr(const char *path, const char *name, char *value, int ret; struct wim_inode *inode; struct wim_ads_entry *ads_entry; - size_t res_size; + u64 stream_size; struct wim_lookup_table_entry *lte; struct wimfs_context *ctx = wimfs_get_context(); if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) return -ENOTSUP; - if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0) + if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0) return -ENOATTR; name += 5; @@ -1658,19 +1658,22 @@ wimfs_getxattr(const char *path, const char *name, char *value, return -ENOATTR; lte = ads_entry->lte; - res_size = wim_resource_size(lte); + stream_size = lte->size; if (size == 0) - return res_size; + return stream_size; - if (res_size > size) + if (stream_size > size) return -ERANGE; - ret = read_full_resource_into_buf(lte, value); - if (ret) - return -errno; - - return res_size; + ret = read_full_stream_into_buf(lte, value); + if (ret) { + if (errno) + return -errno; + else + return -EIO; + } + return stream_size; } #endif @@ -1736,6 +1739,10 @@ wimfs_listxattr(const char *path, char *list, size_t size) p = list; for (i = 0; i < inode->i_num_ads; i++) { + + if (!ads_entry_is_named_stream(&inode->i_ads_entries[i])) + continue; + char *stream_name_mbs; size_t stream_name_mbs_nbytes; int ret; @@ -1825,8 +1832,8 @@ wimfs_open(const char *path, struct fuse_file_info *fi) 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); + ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret) return ret; @@ -1849,7 +1856,7 @@ wimfs_open(const char *path, struct fuse_file_info *fi) if (flags_writable(fi->flags) && (!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE)) { - u64 size = (lte) ? wim_resource_size(lte) : 0; + u64 size = (lte) ? lte->size : 0; ret = extract_resource_to_staging_dir(inode, stream_id, <e, size, ctx); if (ret) @@ -1907,7 +1914,7 @@ wimfs_read(const char *path, char *buf, size_t size, { struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh; ssize_t ret; - u64 res_size; + u64 stream_size; if (!fd) return -EBADF; @@ -1916,14 +1923,14 @@ wimfs_read(const char *path, char *buf, size_t size, return 0; if (fd->f_lte) - res_size = wim_resource_size(fd->f_lte); + stream_size = fd->f_lte->size; else - res_size = 0; + stream_size = 0; - if (offset > res_size) + if (offset > stream_size) return -EOVERFLOW; - size = min(size, res_size - offset); + size = min(size, stream_size - offset); if (size == 0) return 0; @@ -1934,8 +1941,8 @@ wimfs_read(const char *path, char *buf, size_t size, ret = -errno; break; case RESOURCE_IN_WIM: - if (read_partial_wim_resource_into_buf(fd->f_lte, size, - offset, buf)) + if (read_partial_wim_stream_into_buf(fd->f_lte, size, + offset, buf)) ret = -errno; else ret = size; @@ -2116,7 +2123,7 @@ wimfs_setxattr(const char *path, const char *name, if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) return -ENOTSUP; - if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0) + if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0) return -ENOATTR; name += 5; @@ -2183,8 +2190,8 @@ wimfs_truncate(const char *path, off_t size) struct wim_inode *inode; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), - &dentry, <e, &stream_idx); + ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret != 0) return ret; @@ -2192,12 +2199,12 @@ wimfs_truncate(const char *path, off_t size) if (lte == NULL && size == 0) return 0; - if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { + if (lte != NULL && lte->resource_location == RESOURCE_IN_STAGING_FILE) { ret = truncate(lte->staging_file_name, size); if (ret) ret = -errno; else - lte->resource_entry.original_size = size; + lte->size = size; } else { /* File in WIM. Extract it to the staging directory, but only * the first @size bytes of it. */ @@ -2228,13 +2235,13 @@ wimfs_unlink(const char *path) u16 stream_idx; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), - &dentry, <e, &stream_idx); + ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret != 0) return ret; - if (stream_idx == 0) + if (inode_stream_name_nbytes(dentry->d_inode, stream_idx) == 0) remove_dentry(dentry, ctx->wim->lookup_table); else inode_remove_ads(dentry->d_inode, stream_idx - 1, @@ -2255,7 +2262,7 @@ wimfs_utimens(const char *path, const struct timespec tv[2]) struct wim_inode *inode; WIMStruct *wim = wimfs_get_WIMStruct(); - dentry = get_dentry(wim, path); + dentry = get_dentry(wim, path); if (!dentry) return -errno; inode = dentry->d_inode; @@ -2282,7 +2289,7 @@ wimfs_utime(const char *path, struct utimbuf *times) struct wim_inode *inode; WIMStruct *wim = wimfs_get_WIMStruct(); - dentry = get_dentry(wim, path); + dentry = get_dentry(wim, path); if (!dentry) return -errno; inode = dentry->d_inode; @@ -2317,11 +2324,10 @@ wimfs_write(const char *path, const char *buf, size_t size, return -errno; /* Update file size */ - if (offset + size > fd->f_lte->resource_entry.original_size) { + if (offset + size > fd->f_lte->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; + fd->f_lte->size, offset + size); + fd->f_lte->size = offset + size; } /* Update timestamps */ @@ -2386,9 +2392,7 @@ static struct fuse_operations wimfs_operations = { /* API function documented in wimlib.h */ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir, - int mount_flags, WIMStruct **additional_swms, - unsigned num_additional_swms, - const char *staging_dir) + int mount_flags, const char *staging_dir) { int argc; char *argv[16]; @@ -2401,27 +2405,18 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ", wim, image, dir, mount_flags); - if (!wim || !dir) { - ret = WIMLIB_ERR_INVALID_PARAM; - goto out; - } - - ret = verify_swm_set(wim, additional_swms, num_additional_swms); - if (ret) - goto out; + if (!wim || !dir) + return WIMLIB_ERR_INVALID_PARAM; if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { ret = can_delete_from_wim(wim); if (ret) - goto out; + return ret; } - if (num_additional_swms) - merge_lookup_tables(wim, additional_swms, num_additional_swms); - ret = select_wim_image(wim, image); if (ret) - goto out_restore_lookup_table; + return ret; DEBUG("Selected image %d", image); @@ -2430,21 +2425,19 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, if (imd->refcnt != 1) { ERROR("Cannot mount image that was just exported with " "wimlib_export_image()"); - ret = WIMLIB_ERR_INVALID_PARAM; - goto out_restore_lookup_table; + return WIMLIB_ERR_INVALID_PARAM; } if (imd->modified) { ERROR("Cannot mount image that was added " "with wimlib_add_image()"); - ret = WIMLIB_ERR_INVALID_PARAM; - goto out_restore_lookup_table; + return WIMLIB_ERR_INVALID_PARAM; } if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { ret = lock_wim(wim, wim->in_fd.fd); if (ret) - goto out_restore_lookup_table; + return ret; } /* Use default stream interface if one was not specified */ @@ -2568,10 +2561,6 @@ out_unlock: wim->wim_locked = 0; out_free_message_queue_names: free_message_queue_names(&ctx); -out_restore_lookup_table: - if (num_additional_swms) - unmerge_lookup_table(wim); -out: return ret; } @@ -2648,9 +2637,7 @@ wimlib_unmount_image(const tchar *dir, int unmount_flags, WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const tchar *dir, - int mount_flags, WIMStruct **additional_swms, - unsigned num_additional_swms, - const tchar *staging_dir) + int mount_flags, const tchar *staging_dir) { return mount_unsupported_error(); }