struct wimfs_context {
/* The WIMStruct for the mounted WIM. */
- WIMStruct *w;
+ WIMStruct *wim;
/* Working directory when `imagex mount' is run. */
char *working_directory;
static inline WIMStruct *wimfs_get_WIMStruct()
{
- return wimfs_get_context()->w;
+ return wimfs_get_context()->wim;
}
static inline int get_lookup_flags(const struct wimfs_context *ctx)
* 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) {
* */
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);
}
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;
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;
j++;
}
}
-out_free_new_lte:
free_lookup_table_entry(new_lte);
out_delete_staging_file:
unlink(staging_file_name);
*
* If the staging directory cannot be created, staging_dir_name is set to NULL.
* */
-static void make_staging_dir(struct wimfs_context *ctx)
+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) {
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,
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);
{
int ret;
struct lookup_table_entry *lte, *tmp;
- WIMStruct *w = ctx->w;
+ WIMStruct *w = ctx->wim;
DEBUG("Closing all staging file descriptors.");
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;
}
status = 0;
if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
- if (chdir(ctx->working_directory)) {
- ERROR_WITH_ERRNO("chdir()");
- status = WIMLIB_ERR_NOTDIR;
- goto out;
+ if (commit) {
+ ret = chdir(ctx->working_directory);
+ if (ret == 0) {
+ status = rebuild_wim(ctx, (check_integrity != 0));
+ } else {
+ ERROR_WITH_ERRNO("chdir()");
+ status = WIMLIB_ERR_NOTDIR;
+ }
}
- if (commit)
- status = rebuild_wim(ctx, (check_integrity != 0));
ret = delete_staging_dir(ctx);
if (ret != 0) {
ERROR("Failed to delete the staging directory");
} 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);
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)
return -ENOATTR;
name += 5;
- inode = wim_pathname_to_inode(ctx->w, path);
+ inode = wim_pathname_to_inode(ctx->wim, path);
if (!inode)
return -ENOENT;
#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();
/* 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;
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;
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))
/* 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))
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;
struct wimlib_fd *fd = NULL;
struct wimfs_context *ctx = wimfs_get_context();
- inode = wim_pathname_to_inode(ctx->w, path);
+ inode = wim_pathname_to_inode(ctx->wim, path);
if (!inode)
return -ENOENT;
if (!inode_is_directory(inode))
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);
if (ret > 0)
ret = 0;
return ret;
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
return -ENOATTR;
name += 5;
- inode = wim_pathname_to_inode(ctx->w, path);
+ inode = wim_pathname_to_inode(ctx->wim, path);
if (!inode)
return -ENOENT;
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;
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;
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;
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))
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);
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)
{
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;
}
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");
}
#endif
-
/* Mark dentry tree as modified if read-write mount. */
if (flags & WIMLIB_MOUNT_FLAG_READWRITE)
imd->modified = true;
-
/* Resolve all the lookup table entries of the dentry tree */
DEBUG("Resolving lookup table entries");
for_dentry_in_tree(imd->root_dentry, dentry_resolve_ltes,
DEBUG("(next_ino = %"PRIu64")", ctx.next_ino);
/* Finish initializing the filesystem context. */
- ctx.w = wim;
+ ctx.wim = wim;
ctx.mount_flags = flags;
ret = fuse_main(argc, argv, &wimfs_operations, &ctx);
char msg[2];
struct timeval now;
struct timespec timeout;
- int msgsize;
- int errno_save;
+ long msgsize;
struct wimfs_context ctx;
char *mailbox;
if (ret != 0)
goto out_free_message_queue_names;
- /* Send a message to the filesystem saying whether to commit or
+ /* Send a message to the filesystem daemon saying whether to commit or
* not. */
msg[0] = (flags & WIMLIB_UNMOUNT_FLAG_COMMIT) ? 1 : 0;
msg[1] = (flags & WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY) ? 1 : 0;
- DEBUG("Sending message: %s, %s",
- (msg[0] == 0) ? "don't commit" : "commit",
- (msg[1] == 0) ? "don't check" : "check");
+ DEBUG("Sending message: %scommit, %scheck",
+ (msg[0] ? "" : "don't "),
+ (msg[1] ? "" : "don't "));
ret = mq_send(ctx.unmount_to_daemon_mq, msg, 2, 1);
if (ret == -1) {
ERROR_WITH_ERRNO("Failed to notify filesystem daemon whether "
timeout.tv_sec = now.tv_sec + 600;
timeout.tv_nsec = now.tv_usec * 1000;
- msgsize = mq_get_msgsize(ctx.daemon_to_unmount_mq);
-
- if (msgsize < 2) {
- ERROR("Message queue max size must be at least 2!");
- ret = WIMLIB_ERR_MQUEUE;
- goto out_close_message_queues;
- }
-
- mailbox = MALLOC(msgsize);
- if (!mailbox) {
- ERROR("Failed to allocate %ld bytes for mailbox", msgsize);
- ret = WIMLIB_ERR_NOMEM;
+ ret = get_mailbox(ctx.daemon_to_unmount_mq, 2, &msgsize, &mailbox);
+ if (ret != 0)
goto out_close_message_queues;
- }
-
mailbox[0] = 0;
DEBUG("Waiting for message telling us whether the unmount was "
goto out_free_mailbox;
}
- DEBUG("Received message: %s",
- (mailbox[0] == 0) ? "Unmount OK" : "Unmount Failed");
- if (mailbox[0] != 0)
- ERROR("Unmount failed");
+ DEBUG("Received message: Unmount %s", (mailbox[0] ? "Failed" : "Ok"));
ret = mailbox[0];
+ if (ret)
+ ERROR("Unmount failed");
out_free_mailbox:
FREE(mailbox);
out_close_message_queues:
static inline int mount_unsupported_error()
{
- ERROR("WIMLIB was compiled with --without-fuse, which disables support "
+ ERROR("wimlib was compiled with --without-fuse, which disables support "
"for mounting WIMs.");
return WIMLIB_ERR_UNSUPPORTED;
}