X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount.c;h=15d7444ed3036dc182712bed85fde61feaefc77e;hp=6bff87d41d243c5ff55bf63bb423980bef4c02f7;hb=5cdd60306facd14cc9dcc24471386451294ca73c;hpb=39c533628d784ecc6b20694bf6cc78eeb531a554 diff --git a/src/mount.c b/src/mount.c index 6bff87d4..15d7444e 100644 --- a/src/mount.c +++ b/src/mount.c @@ -35,6 +35,7 @@ #include "xml.h" #include "io.h" #include "timestamp.h" +#include #include #include #include @@ -62,7 +63,7 @@ struct wimlib_fd { struct wimfs_context { /* The WIMStruct for the mounted WIM. */ - WIMStruct *w; + WIMStruct *wim; /* Working directory when `imagex mount' is run. */ char *working_directory; @@ -111,7 +112,12 @@ static inline struct wimfs_context *wimfs_get_context() static inline WIMStruct *wimfs_get_WIMStruct() { - return wimfs_get_context()->w; + return wimfs_get_context()->wim; +} + +static inline bool wimfs_ctx_readonly(const struct wimfs_context *ctx) +{ + return (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) == 0; } static inline int get_lookup_flags(const struct wimfs_context *ctx) @@ -135,16 +141,21 @@ static inline int flags_writable(int open_flags) * @stream_id: ID of the stream we're opening * @lte: Lookup table entry for the stream (may be NULL) * @fd_ret: Return the allocated file descriptor if successful. + * @readonly: True if this is a read-only mount. * * Return 0 iff successful or error code if unsuccessful. */ static int alloc_wimlib_fd(struct inode *inode, u32 stream_id, struct lookup_table_entry *lte, - struct wimlib_fd **fd_ret) + struct wimlib_fd **fd_ret, + bool readonly) { static const u16 fds_per_alloc = 8; static const u16 max_fds = 0xffff; + int ret; + + pthread_mutex_lock(&inode->i_mutex); DEBUG("Allocating fd for stream ID %u from inode %lx (open = %u, allocated = %u)", stream_id, inode->ino, inode->num_opened_fds, @@ -154,16 +165,20 @@ static int alloc_wimlib_fd(struct inode *inode, struct wimlib_fd **fds; u16 num_new_fds; - if (inode->num_allocated_fds == max_fds) - return -EMFILE; + if (inode->num_allocated_fds == max_fds) { + ret = -EMFILE; + goto out; + } num_new_fds = min(fds_per_alloc, max_fds - inode->num_allocated_fds); fds = REALLOC(inode->fds, (inode->num_allocated_fds + num_new_fds) * sizeof(inode->fds[0])); - if (!fds) - return -ENOMEM; + if (!fds) { + ret = -ENOMEM; + goto out; + } memset(&fds[inode->num_allocated_fds], 0, num_new_fds * sizeof(fds[0])); inode->fds = fds; @@ -172,8 +187,10 @@ static int alloc_wimlib_fd(struct inode *inode, for (u16 i = 0; ; i++) { if (!inode->fds[i]) { struct wimlib_fd *fd = CALLOC(1, sizeof(*fd)); - if (!fd) - return -ENOMEM; + if (!fd) { + ret = -ENOMEM; + break; + } fd->f_inode = inode; fd->f_lte = lte; fd->staging_fd = -1; @@ -182,32 +199,43 @@ static int alloc_wimlib_fd(struct inode *inode, *fd_ret = fd; inode->fds[i] = fd; inode->num_opened_fds++; - if (lte) + if (lte && !readonly) lte->num_opened_fds++; - DEBUG("Allocated fd"); - return 0; + DEBUG("Allocated fd (idx = %u)", fd->idx); + ret = 0; + break; } } +out: + pthread_mutex_unlock(&inode->i_mutex); + return ret; } 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); + + pthread_mutex_lock(&inode->i_mutex); + 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; FREE(fd); - if (--inode->num_opened_fds == 0 && inode->link_count == 0) + if (--inode->num_opened_fds == 0 && inode->link_count == 0) { + pthread_mutex_unlock(&inode->i_mutex); free_inode(inode); + } else { + pthread_mutex_unlock(&inode->i_mutex); + } } static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd) { - wimlib_assert(fd); + wimlib_assert(fd != NULL); wimlib_assert(fd->f_lte == lte); if (!lte) /* Empty stream with no lookup table entry */ @@ -231,7 +259,7 @@ static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd) static int close_wimlib_fd(struct wimlib_fd *fd) { int ret; - wimlib_assert(fd); + wimlib_assert(fd != NULL); DEBUG("Closing fd (inode = %lu, opened = %u, allocated = %u)", fd->f_inode->ino, fd->f_inode->num_opened_fds, fd->f_inode->num_allocated_fds); @@ -380,7 +408,7 @@ static int extract_resource_to_staging_dir(struct inode *inode, * to the stream we're trying to extract, so the lookup * table entry can be re-used. */ DEBUG("Re-using lookup table entry"); - lookup_table_unlink(ctx->w->lookup_table, old_lte); + lookup_table_unlink(ctx->wim->lookup_table, old_lte); new_lte = old_lte; } else { if (old_lte) { @@ -391,7 +419,7 @@ static int extract_resource_to_staging_dir(struct inode *inode, * */ wimlib_assert(old_lte->refcnt > inode->link_count); DEBUG("Splitting lookup table entry " - "(inode->link_count = %zu, old_lte->refcnt = %u)", + "(inode->link_count = %u, old_lte->refcnt = %u)", inode->link_count, old_lte->refcnt); } @@ -430,7 +458,7 @@ static int extract_resource_to_staging_dir(struct inode *inode, j++; } } - DEBUG("%zu fd's were already opened to the file we extracted", + DEBUG("%hu fd's were already opened to the file we extracted", new_lte->num_opened_fds); if (old_lte) { old_lte->num_opened_fds -= new_lte->num_opened_fds; @@ -452,7 +480,7 @@ static int extract_resource_to_staging_dir(struct inode *inode, if (inode->ads_entries[i].stream_id == stream_id) inode->ads_entries[i].lte = new_lte; - lookup_table_insert(ctx->w->lookup_table, new_lte); + lookup_table_insert(ctx->wim->lookup_table, new_lte); list_add(&new_lte->staging_list, &ctx->staging_list); *lte = new_lte; return 0; @@ -468,7 +496,6 @@ out_revert_fd_changes: j++; } } -out_free_new_lte: free_lookup_table_entry(new_lte); out_delete_staging_file: unlink(staging_file_name); @@ -477,34 +504,30 @@ out_delete_staging_file: } /* - * Creates a randomly named staging directory and returns its name into the - * static variable staging_dir_name. - * - * If the staging directory cannot be created, staging_dir_name is set to NULL. - * */ -static void make_staging_dir(struct wimfs_context *ctx) + * Creates a randomly named staging directory and saves its name in the + * filesystem context structure. + */ +static int make_staging_dir(struct wimfs_context *ctx) { /* XXX Give the user an option of where to stage files */ - static char prefix[] = "wimlib-staging-"; - static const size_t prefix_len = 15; - static const size_t suffix_len = 10; + static const char prefix[] = "wimlib-staging-"; + static const size_t prefix_len = sizeof(prefix) - 1; + static const size_t random_suffix_len = 10; size_t pwd_len = strlen(ctx->working_directory); - ctx->staging_dir_name_len = pwd_len + 1 + prefix_len + suffix_len; + ctx->staging_dir_name_len = pwd_len + 1 + prefix_len + random_suffix_len; ctx->staging_dir_name = MALLOC(ctx->staging_dir_name_len + 1); - if (!ctx->staging_dir_name) { - ERROR("Out of memory"); - return; - } + if (!ctx->staging_dir_name) + return WIMLIB_ERR_NOMEM; memcpy(ctx->staging_dir_name, ctx->working_directory, pwd_len); ctx->staging_dir_name[pwd_len] = '/'; memcpy(ctx->staging_dir_name + pwd_len + 1, prefix, prefix_len); randomize_char_array_with_alnum(ctx->staging_dir_name + pwd_len + - 1 + prefix_len, suffix_len); + 1 + prefix_len, random_suffix_len); ctx->staging_dir_name[ctx->staging_dir_name_len] = '\0'; if (mkdir(ctx->staging_dir_name, 0700) != 0) { @@ -512,7 +535,9 @@ static void make_staging_dir(struct wimfs_context *ctx) ctx->staging_dir_name); FREE(ctx->staging_dir_name); ctx->staging_dir_name = NULL; + return WIMLIB_ERR_MKDIR; } + return 0; } static int remove_file_or_directory(const char *fpath, const struct stat *sb, @@ -533,7 +558,7 @@ static int remove_file_or_directory(const char *fpath, const struct stat *sb, static int delete_staging_dir(struct wimfs_context *ctx) { int ret; - + wimlib_assert(ctx->staging_dir_name != NULL); ret = nftw(ctx->staging_dir_name, remove_file_or_directory, 10, FTW_DEPTH); FREE(ctx->staging_dir_name); @@ -542,72 +567,65 @@ static int delete_staging_dir(struct wimfs_context *ctx) } -/* Simple function that returns the concatenation of 4 strings. */ -static char *strcat_dup(const char *s1, const char *s2, const char *s3, - const char *s4) +/* Simple function that returns the concatenation of 2 strings. */ +static char *strcat_dup(const char *s1, const char *s2, size_t max_len) { - size_t len = strlen(s1) + strlen(s2) + strlen(s3) + strlen(s4) + 1; - char *p = MALLOC(len); + size_t len = strlen(s1) + strlen(s2); + if (len > max_len) + len = max_len; + char *p = MALLOC(len + 1); if (!p) return NULL; - p = strcpy(p, s1); - p = strcat(p, s2); - p = strcat(p, s3); - return strcat(p, s4); + snprintf(p, len + 1, "%s%s", s1, s2); + return p; } -/* Removes trailing forward slashes in a string. */ -static void remove_trailing_slashes(char *s) +static int set_message_queue_names(struct wimfs_context *ctx, + const char *mount_dir) { - long len = strlen(s); - for (long i = len - 1; i >= 1; i--) { - if (s[i] == '/') - s[i] = '\0'; - else - break; - } -} + static const char *u2d_prefix = "/wimlib-unmount-to-daemon-mq"; + static const char *d2u_prefix = "/wimlib-daemon-to-unmount-mq"; + char *dir_path; + char *p; + int ret; -/* Changes forward slashes to underscores in a string. */ -static void s_slashes_underscores_g(char *s) -{ - while (*s) { - if (*s == '/') - *s = '_'; - s++; + dir_path = realpath(mount_dir, NULL); + if (!dir_path) { + ERROR_WITH_ERRNO("Failed to resolve path \"%s\"", mount_dir); + return WIMLIB_ERR_NOTDIR; } -} -static int set_message_queue_names(struct wimfs_context *ctx, - const char *mount_dir) -{ - static const char *slash = "/"; - static const char *prefix = "wimlib-"; - static const char *u2d_suffix = "unmount-to-daemon-mq"; - static const char *d2u_suffix = "daemon-to-unmount-mq"; + DEBUG("Using absolute dir_path = `%s'", dir_path); - const char *mount_dir_basename = path_basename(mount_dir); - ctx->unmount_to_daemon_mq_name = strcat_dup(slash, mount_dir_basename, - prefix, u2d_suffix); + p = dir_path; + while (*p) { + if (*p == '/') + *p = 0xff; + p++; + } + + ctx->unmount_to_daemon_mq_name = strcat_dup(u2d_prefix, dir_path, + NAME_MAX); if (!ctx->unmount_to_daemon_mq_name) { - ERROR("Out of memory"); - return WIMLIB_ERR_NOMEM; + ret = WIMLIB_ERR_NOMEM; + goto out_free_dir_path; } - ctx->daemon_to_unmount_mq_name = strcat_dup(slash, mount_dir_basename, - prefix, d2u_suffix); + ctx->daemon_to_unmount_mq_name = strcat_dup(d2u_prefix, dir_path, + NAME_MAX); if (!ctx->daemon_to_unmount_mq_name) { - ERROR("Out of memory"); - FREE(ctx->unmount_to_daemon_mq_name); - ctx->unmount_to_daemon_mq_name = NULL; - return WIMLIB_ERR_NOMEM; + ret = WIMLIB_ERR_NOMEM; + goto out_free_unmount_to_daemon_mq_name; } - remove_trailing_slashes(ctx->unmount_to_daemon_mq_name); - remove_trailing_slashes(ctx->daemon_to_unmount_mq_name); - s_slashes_underscores_g(ctx->unmount_to_daemon_mq_name + 1); - s_slashes_underscores_g(ctx->daemon_to_unmount_mq_name + 1); - return 0; + ret = 0; + goto out_free_dir_path; +out_free_unmount_to_daemon_mq_name: + FREE(ctx->unmount_to_daemon_mq_name); + ctx->unmount_to_daemon_mq_name = NULL; +out_free_dir_path: + FREE(dir_path); + return ret; } static void free_message_queue_names(struct wimfs_context *ctx) @@ -641,6 +659,7 @@ static int open_message_queues(struct wimfs_context *ctx, bool daemon) else flags = O_WRONLY | O_CREAT; + DEBUG("Opening message queue \"%s\"", ctx->unmount_to_daemon_mq_name); ctx->unmount_to_daemon_mq = mq_open(ctx->unmount_to_daemon_mq_name, flags, 0700, NULL); @@ -655,6 +674,7 @@ static int open_message_queues(struct wimfs_context *ctx, bool daemon) else flags = O_RDONLY | O_CREAT; + DEBUG("Opening message queue \"%s\"", ctx->daemon_to_unmount_mq_name); ctx->daemon_to_unmount_mq = mq_open(ctx->daemon_to_unmount_mq_name, flags, 0700, NULL); @@ -751,6 +771,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) @@ -835,11 +877,11 @@ static int rebuild_wim(struct wimfs_context *ctx, bool check_integrity) { int ret; struct lookup_table_entry *lte, *tmp; - WIMStruct *w = ctx->w; + WIMStruct *w = ctx->wim; DEBUG("Closing all staging file descriptors."); - list_for_each_entry(lte, &ctx->staging_list, staging_list) { + list_for_each_entry_safe(lte, tmp, &ctx->staging_list, staging_list) { ret = inode_close_fds(lte->lte_inode); if (ret != 0) return ret; @@ -847,14 +889,14 @@ static int rebuild_wim(struct wimfs_context *ctx, bool check_integrity) DEBUG("Calculating SHA1 checksums for all new staging files."); list_for_each_entry_safe(lte, tmp, &ctx->staging_list, staging_list) { - ret = update_lte_of_staging_file(lte, ctx->w->lookup_table); + ret = update_lte_of_staging_file(lte, ctx->wim->lookup_table); if (ret != 0) return ret; } xml_update_image_info(w, w->current_image); - ret = wimlib_overwrite(w, check_integrity); + ret = wimlib_overwrite(w, check_integrity, 0); if (ret != 0) { ERROR("Failed to commit changes"); return ret; @@ -911,12 +953,13 @@ static void wimfs_destroy(void *p) status = 0; if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { if (commit) { - if (chdir(ctx->working_directory)) { + ret = chdir(ctx->working_directory); + if (ret == 0) { + status = rebuild_wim(ctx, (check_integrity != 0)); + } else { ERROR_WITH_ERRNO("chdir()"); status = WIMLIB_ERR_NOTDIR; - goto out; } - status = rebuild_wim(ctx, (check_integrity != 0)); } ret = delete_staging_dir(ctx); if (ret != 0) { @@ -927,12 +970,10 @@ static void wimfs_destroy(void *p) } else { DEBUG("Read-only mount"); } -out: DEBUG("Sending status %hhd", status); ret = mq_send(ctx->daemon_to_unmount_mq, &status, 1, 1); if (ret == -1) ERROR_WITH_ERRNO("Failed to send status to unmount process"); -out_free_mailbox: FREE(mailbox); out_close_message_queues: close_message_queues(ctx); @@ -962,7 +1003,7 @@ static int wimfs_ftruncate(const char *path, off_t size, struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; int ret = ftruncate(fd->staging_fd, size); if (ret != 0) - return ret; + return -errno; if (fd->f_lte && size < fd->f_lte->resource_entry.original_size) fd->f_lte->resource_entry.original_size = size; return 0; @@ -978,7 +1019,7 @@ static int wimfs_getattr(const char *path, struct stat *stbuf) int ret; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->w, path, + ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK, &dentry, <e, NULL); if (ret != 0) @@ -1005,7 +1046,7 @@ static int wimfs_getxattr(const char *path, const char *name, char *value, return -ENOATTR; name += 5; - inode = wim_pathname_to_inode(ctx->w, path); + inode = wim_pathname_to_inode(ctx->wim, path); if (!inode) return -ENOENT; @@ -1022,7 +1063,8 @@ static int wimfs_getxattr(const char *path, const char *name, char *value, if (res_size > size) return -ERANGE; - ret = read_full_wim_resource(lte, (u8*)value); + ret = read_full_wim_resource(lte, (u8*)value, + WIMLIB_RESOURCE_FLAG_MULTITHREADED); if (ret != 0) return -EIO; @@ -1070,16 +1112,14 @@ 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; } #ifdef ENABLE_XATTR static int wimfs_listxattr(const char *path, char *list, size_t size) { - int ret; size_t needed_size; - unsigned i; struct inode *inode; struct wimfs_context *ctx = wimfs_get_context(); @@ -1088,18 +1128,18 @@ static int wimfs_listxattr(const char *path, char *list, size_t size) /* List alternate data streams, or get the list size */ - inode = wim_pathname_to_inode(ctx->w, path); + inode = wim_pathname_to_inode(ctx->wim, path); if (!inode) return -ENOENT; if (size == 0) { needed_size = 0; - for (i = 0; i < inode->num_ads; i++) + for (u16 i = 0; i < inode->num_ads; i++) needed_size += inode->ads_entries[i].stream_name_utf8_len + 6; return needed_size; } else { char *p = list; - for (i = 0; i < inode->num_ads; i++) { + for (u16 i = 0; i < inode->num_ads; i++) { needed_size = inode->ads_entries[i].stream_name_utf8_len + 6; if (needed_size > size) return -ERANGE; @@ -1123,7 +1163,7 @@ static int wimfs_mkdir(const char *path, mode_t mode) const char *basename; struct wimfs_context *ctx = wimfs_get_context(); - parent = get_parent_dentry(ctx->w, path); + parent = get_parent_dentry(ctx->wim, path); if (!parent) return -ENOENT; @@ -1138,7 +1178,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; } @@ -1157,7 +1197,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) wimlib_assert(*p == ':'); *p = '\0'; - inode = wim_pathname_to_inode(ctx->w, path); + inode = wim_pathname_to_inode(ctx->wim, path); if (!inode) return -ENOENT; if (!inode_is_regular_file(inode)) @@ -1175,7 +1215,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) /* Make sure that the parent of @path exists and is a directory, and * that the dentry named by @path does not already exist. */ - parent = get_parent_dentry(ctx->w, path); + parent = get_parent_dentry(ctx->wim, path); if (!parent) return -ENOENT; if (!dentry_is_directory(parent)) @@ -1190,7 +1230,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; } @@ -1208,7 +1248,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) u32 stream_id; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->w, path, get_lookup_flags(ctx), + ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), &dentry, <e, &stream_idx); if (ret != 0) return ret; @@ -1236,7 +1276,8 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) return ret; } - ret = alloc_wimlib_fd(inode, stream_id, lte, &fd); + ret = alloc_wimlib_fd(inode, stream_id, lte, &fd, + wimfs_ctx_readonly(ctx)); if (ret != 0) return ret; @@ -1258,13 +1299,14 @@ static int wimfs_opendir(const char *path, struct fuse_file_info *fi) int ret; struct wimlib_fd *fd = NULL; struct wimfs_context *ctx = wimfs_get_context(); + WIMStruct *w = ctx->wim; - inode = wim_pathname_to_inode(ctx->w, path); + inode = wim_pathname_to_inode(w, path); if (!inode) return -ENOENT; if (!inode_is_directory(inode)) return -ENOTDIR; - ret = alloc_wimlib_fd(inode, 0, NULL, &fd); + ret = alloc_wimlib_fd(inode, 0, NULL, &fd, wimfs_ctx_readonly(ctx)); fi->fh = (uintptr_t)fd; return ret; } @@ -1302,6 +1344,8 @@ static int wimfs_read(const char *path, char *buf, size_t size, } else { /* Read from WIM */ + wimlib_assert(fd->f_lte->resource_location == RESOURCE_IN_WIM); + u64 res_size = wim_resource_size(fd->f_lte); if (offset > res_size) @@ -1310,12 +1354,25 @@ static int wimfs_read(const char *path, char *buf, size_t size, size = min(size, res_size - offset); if (read_wim_resource(fd->f_lte, (u8*)buf, - size, offset, false) != 0) + size, offset, + WIMLIB_RESOURCE_FLAG_MULTITHREADED) != 0) return -EIO; return size; } } +struct fill_params { + void *buf; + fuse_fill_dir_t filler; +}; + +static int dentry_fuse_fill(struct dentry *dentry, void *arg) +{ + struct fill_params *fill_params = arg; + return fill_params->filler(fill_params->buf, dentry->file_name_utf8, + NULL, 0); +} + /* Fills in the entries of the directory specified by @path using the * FUSE-provided function @filler. */ static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler, @@ -1323,41 +1380,37 @@ static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler, { struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; struct inode *inode; - struct dentry *child; if (!fd) return -EBADF; inode = fd->f_inode; + struct fill_params fill_params = { + .buf = buf, + .filler = filler, + }; + filler(buf, ".", NULL, 0); filler(buf, "..", NULL, 0); - child = inode->children; - - if (!child) - return 0; - - do { - if (filler(buf, child->file_name_utf8, NULL, 0)) - return 0; - child = child->next; - } while (child != inode->children); - return 0; + return for_dentry_in_rbtree(inode->children.rb_node, + dentry_fuse_fill, &fill_params); } static int wimfs_readlink(const char *path, char *buf, size_t buf_len) { struct wimfs_context *ctx = wimfs_get_context(); - struct inode *inode = wim_pathname_to_inode(ctx->w, path); + struct inode *inode = wim_pathname_to_inode(ctx->wim, path); int ret; if (!inode) return -ENOENT; if (!inode_is_symlink(inode)) return -EINVAL; - ret = inode_readlink(inode, buf, buf_len, ctx->w); + ret = inode_readlink(inode, buf, buf_len, ctx->wim, + WIMLIB_RESOURCE_FLAG_MULTITHREADED); if (ret > 0) ret = 0; return ret; @@ -1393,14 +1446,14 @@ static int wimfs_removexattr(const char *path, const char *name) return -ENOATTR; name += 5; - inode = wim_pathname_to_inode(ctx->w, path); + inode = wim_pathname_to_inode(ctx->wim, path); if (!inode) return -ENOENT; ads_entry = inode_get_ads_entry(inode, name, &ads_idx); if (!ads_entry) return -ENOATTR; - inode_remove_ads(inode, ads_idx, ctx->w->lookup_table); + inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table); return 0; } #endif @@ -1447,7 +1500,7 @@ static int wimfs_rename(const char *from, const char *to) * directory */ if (!dentry_is_directory(dst)) return -ENOTDIR; - if (dst->d_inode->children != NULL) + if (inode_has_children(dst->d_inode)) return -ENOTEMPTY; } parent_of_dst = dst->parent; @@ -1470,7 +1523,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; } @@ -1512,7 +1565,7 @@ static int wimfs_setxattr(const char *path, const char *name, return -ENOATTR; name += 5; - inode = wim_pathname_to_inode(ctx->w, path); + inode = wim_pathname_to_inode(ctx->wim, path); if (!inode) return -ENOENT; @@ -1520,7 +1573,7 @@ static int wimfs_setxattr(const char *path, const char *name, if (existing_ads_entry) { if (flags & XATTR_CREATE) return -EEXIST; - inode_remove_ads(inode, ads_idx, ctx->w->lookup_table); + inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table); } else { if (flags & XATTR_REPLACE) return -ENOATTR; @@ -1531,7 +1584,7 @@ static int wimfs_setxattr(const char *path, const char *name, sha1_buffer((const u8*)value, size, value_hash); - existing_lte = __lookup_resource(ctx->w->lookup_table, value_hash); + existing_lte = __lookup_resource(ctx->wim->lookup_table, value_hash); if (existing_lte) { lte = existing_lte; @@ -1553,7 +1606,7 @@ static int wimfs_setxattr(const char *path, const char *name, lte->resource_entry.size = size; lte->resource_entry.flags = 0; copy_hash(lte->hash, value_hash); - lookup_table_insert(ctx->w->lookup_table, lte); + lookup_table_insert(ctx->wim->lookup_table, lte); } new_ads_entry->lte = lte; return 0; @@ -1567,7 +1620,7 @@ static int wimfs_symlink(const char *to, const char *from) struct inode *inode; struct wimfs_context *ctx = wimfs_get_context(); - dentry_parent = get_parent_dentry(ctx->w, from); + dentry_parent = get_parent_dentry(ctx->wim, from); if (!dentry_parent) return -ENOENT; if (!dentry_is_directory(dentry_parent)) @@ -1587,10 +1640,10 @@ static int wimfs_symlink(const char *to, const char *from) inode->ino = ctx->next_ino++; inode->resolved = true; - if (inode_set_symlink(inode, to, ctx->w->lookup_table, NULL) != 0) + 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); @@ -1609,7 +1662,7 @@ static int wimfs_truncate(const char *path, off_t size) struct inode *inode; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->w, path, get_lookup_flags(ctx), + ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), &dentry, <e, &stream_idx); if (ret != 0) @@ -1646,23 +1699,21 @@ static int wimfs_unlink(const char *path) { struct dentry *dentry; struct lookup_table_entry *lte; - struct inode *inode; int ret; u16 stream_idx; - unsigned i; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->w, path, get_lookup_flags(ctx), + ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), &dentry, <e, &stream_idx); if (ret != 0) return ret; if (stream_idx == 0) - remove_dentry(dentry, ctx->w->lookup_table); + remove_dentry(dentry, ctx->wim->lookup_table); else inode_remove_ads(dentry->d_inode, stream_idx - 1, - ctx->w->lookup_table); + ctx->wim->lookup_table); return 0; } @@ -1702,6 +1753,8 @@ static int wimfs_utime(const char *path, struct utimbuf *times) { struct dentry *dentry; struct inode *inode; + WIMStruct *w = wimfs_get_WIMStruct(); + dentry = get_dentry(w, path); if (!dentry) return -ENOENT; @@ -1748,6 +1801,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, @@ -1788,6 +1842,14 @@ static struct fuse_operations wimfs_operations = { .utime = wimfs_utime, #endif .write = wimfs_write, + +#if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8) + .flag_nullpath_ok = 1, +#endif +#if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 9) + .flag_nopath = 1, + .flag_utime_omit_ok = 1, +#endif }; @@ -1814,6 +1876,11 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, if (ret != 0) return ret; + if ((flags & WIMLIB_MOUNT_FLAG_READWRITE) && (wim->hdr.total_parts != 1)) { + ERROR("Cannot mount a split WIM read-write"); + return WIMLIB_ERR_SPLIT_UNSUPPORTED; + } + if (num_additional_swms) { ret = new_joined_lookup_table(wim, additional_swms, num_additional_swms, @@ -1835,7 +1902,14 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, if (imd->root_dentry->refcnt != 1) { ERROR("Cannot mount image that was just exported with " - "wimlib_export()"); + "wimlib_export_image()"); + ret = WIMLIB_ERR_INVALID_PARAM; + goto out; + } + + if (imd->modified) { + ERROR("Cannot mount image that was added " + "with wimlib_add_image()"); ret = WIMLIB_ERR_INVALID_PARAM; goto out; } @@ -1871,7 +1945,10 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, argv[argc++] = "imagex"; argv[argc++] = dir_copy; - argv[argc++] = "-s"; /* disable multi-threaded operation */ + + /* disable multi-threaded operation for read-write mounts */ + if (flags & WIMLIB_MOUNT_FLAG_READWRITE) + argv[argc++] = "-s"; if (flags & WIMLIB_MOUNT_FLAG_DEBUG) argv[argc++] = "-d"; @@ -1887,11 +1964,9 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, argv[argc++] = optstring; if ((flags & WIMLIB_MOUNT_FLAG_READWRITE)) { /* Read-write mount. Make the staging directory */ - make_staging_dir(&ctx); - if (!ctx.staging_dir_name) { - ret = WIMLIB_ERR_MKDIR; + ret = make_staging_dir(&ctx); + if (ret != 0) goto out_free_dir_copy; - } } else { /* Read-only mount */ strcat(optstring, ",ro"); @@ -1911,11 +1986,11 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, } #endif - /* Mark dentry tree as modified if read-write mount. */ - if (flags & WIMLIB_MOUNT_FLAG_READWRITE) + if (flags & WIMLIB_MOUNT_FLAG_READWRITE) { imd->modified = true; - + imd->has_been_mounted_rw = true; + } /* Resolve all the lookup table entries of the dentry tree */ DEBUG("Resolving lookup table entries"); @@ -1926,10 +2001,14 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, DEBUG("(next_ino = %"PRIu64")", ctx.next_ino); /* Finish initializing the filesystem context. */ - ctx.w = wim; + ctx.wim = wim; ctx.mount_flags = flags; + DEBUG("Calling fuse_main()"); + ret = fuse_main(argc, argv, &wimfs_operations, &ctx); + + DEBUG("Returned from fuse_main() (ret = %d)", ret); if (ret) ret = WIMLIB_ERR_FUSE; out_free_dir_copy: