/* The WIMStruct for the mounted WIM. */
WIMStruct *wim;
- /* Working directory when `imagex mount' is run. */
- char *working_directory;
-
/* Name of the staging directory for a read-write mount. Whenever a new file is
* created, it is done so in the staging directory. Furthermore, whenever a
* file in the WIM is modified, it is extracted to the staging directory. If
* Creates a randomly named staging directory and saves its name in the
* filesystem context structure.
*/
-static int make_staging_dir(struct wimfs_context *ctx)
+static int make_staging_dir(struct wimfs_context *ctx,
+ const char *user_prefix)
{
- /* XXX Give the user an option of where to stage files */
-
- static const char prefix[] = "wimlib-staging-";
- static const size_t prefix_len = sizeof(prefix) - 1;
static const size_t random_suffix_len = 10;
+ static const char *common_suffix = ".staging";
+ static const size_t common_suffix_len = 8;
- size_t pwd_len = strlen(ctx->working_directory);
+ char *staging_dir_name = NULL;
+ size_t staging_dir_name_len;
+ size_t prefix_len;
+ const char *wim_basename;
+ char *real_user_prefix = NULL;
+ int ret;
- ctx->staging_dir_name_len = pwd_len + 1 + prefix_len + random_suffix_len;
+ if (user_prefix) {
+ real_user_prefix = realpath(user_prefix, NULL);
+ if (!real_user_prefix) {
+ ERROR_WITH_ERRNO("Could not resolve `%s'",
+ real_user_prefix);
+ ret = WIMLIB_ERR_NOTDIR;
+ goto out;
+ }
+ wim_basename = path_basename(ctx->wim->filename);
+ prefix_len = strlen(real_user_prefix) + 1 + strlen(wim_basename);
+ } else {
+ prefix_len = strlen(ctx->wim->filename);
+ }
- ctx->staging_dir_name = MALLOC(ctx->staging_dir_name_len + 1);
- if (!ctx->staging_dir_name)
- return WIMLIB_ERR_NOMEM;
+ staging_dir_name_len = prefix_len + common_suffix_len + random_suffix_len;
- 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, random_suffix_len);
- ctx->staging_dir_name[ctx->staging_dir_name_len] = '\0';
+ staging_dir_name = MALLOC(staging_dir_name_len + 1);
+ if (!staging_dir_name) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out;
+ }
+
+ if (real_user_prefix)
+ sprintf(staging_dir_name, "%s/%s", real_user_prefix, wim_basename);
+ else
+ strcpy(staging_dir_name, ctx->wim->filename);
- if (mkdir(ctx->staging_dir_name, 0700) != 0) {
+ strcat(staging_dir_name, common_suffix);
+
+ randomize_char_array_with_alnum(staging_dir_name + prefix_len + common_suffix_len,
+ random_suffix_len);
+
+ staging_dir_name[staging_dir_name_len] = '\0';
+
+ if (mkdir(staging_dir_name, 0700) != 0) {
ERROR_WITH_ERRNO("Failed to create temporary directory `%s'",
- ctx->staging_dir_name);
- FREE(ctx->staging_dir_name);
- ctx->staging_dir_name = NULL;
- return WIMLIB_ERR_MKDIR;
+ staging_dir_name);
+ ret = WIMLIB_ERR_MKDIR;
+ } else {
+ ret = 0;
}
- return 0;
+out:
+ FREE(real_user_prefix);
+ if (ret == 0) {
+ ctx->staging_dir_name = staging_dir_name;
+ ctx->staging_dir_name_len = staging_dir_name_len;
+ } else {
+ FREE(staging_dir_name);
+ }
+ return ret;
}
static int remove_file_or_directory(const char *fpath, const struct stat *sb,
}
/* Overwrites the WIM file, with changes saved. */
-static int rebuild_wim(struct wimfs_context *ctx, bool check_integrity)
+static int rebuild_wim(struct wimfs_context *ctx, int write_flags)
{
int ret;
struct lookup_table_entry *lte, *tmp;
xml_update_image_info(w, w->current_image);
- ret = wimlib_overwrite(w, check_integrity, 0);
+ ret = wimlib_overwrite(w, write_flags, 0, NULL);
if (ret != 0) {
ERROR("Failed to commit changes");
return ret;
char status;
char *mailbox;
struct wimfs_context *ctx = wimfs_get_context();
+ int write_flags;
if (open_message_queues(ctx, true))
return;
status = 0;
if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
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 (check_integrity)
+ write_flags = WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
+ else
+ write_flags = 0;
+ status = rebuild_wim(ctx, write_flags);
}
ret = delete_staging_dir(ctx);
if (ret != 0) {
};
-/* Mounts a WIM file. */
-WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
- int flags, WIMStruct **additional_swms,
- unsigned num_additional_swms)
+/* Mounts an image from a WIM file. */
+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 argc = 0;
char *argv[16];
struct wimfs_context ctx;
DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ",
- wim, image, dir, flags);
+ wim, image, dir, mount_flags);
if (!wim || !dir)
return WIMLIB_ERR_INVALID_PARAM;
if (ret != 0)
return ret;
- if ((flags & WIMLIB_MOUNT_FLAG_READWRITE) && (wim->hdr.total_parts != 1)) {
+ if ((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) && (wim->hdr.total_parts != 1)) {
ERROR("Cannot mount a split WIM read-write");
return WIMLIB_ERR_SPLIT_UNSUPPORTED;
}
goto out;
}
- if (!(flags & (WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |
+ if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
+ ret = lock_wim(wim->fp, wim->filename);
+ if (ret != 0)
+ goto out;
+ }
+
+ if (!(mount_flags & (WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |
WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR |
WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)))
- flags |= WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR;
+ mount_flags |= WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR;
DEBUG("Initializing struct wimfs_context");
init_wimfs_context(&ctx);
-
- DEBUG("Getting current directory");
- ctx.working_directory = getcwd(NULL, 0);
- if (!ctx.working_directory) {
- ERROR_WITH_ERRNO("Could not determine current directory");
- ret = WIMLIB_ERR_NOTDIR;
- goto out;
- }
+ ctx.wim = wim;
+ ctx.mount_flags = mount_flags;
DEBUG("Unlinking message queues in case they already exist");
ret = set_message_queue_names(&ctx, dir);
if (ret != 0)
- goto out_free_working_directory;
+ goto out;
unlink_message_queues(&ctx);
DEBUG("Preparing arguments to fuse_main()");
argv[argc++] = dir_copy;
/* disable multi-threaded operation for read-write mounts */
- if (flags & WIMLIB_MOUNT_FLAG_READWRITE)
+ if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
argv[argc++] = "-s";
- if (flags & WIMLIB_MOUNT_FLAG_DEBUG)
+ if (mount_flags & WIMLIB_MOUNT_FLAG_DEBUG)
argv[argc++] = "-d";
/*
char optstring[256] = "use_ino,subtype=wimfs,attr_timeout=0";
argv[argc++] = "-o";
argv[argc++] = optstring;
- if ((flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
+ if ((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
/* Read-write mount. Make the staging directory */
- ret = make_staging_dir(&ctx);
+ ret = make_staging_dir(&ctx, staging_dir);
if (ret != 0)
goto out_free_dir_copy;
} else {
#endif
/* Mark dentry tree as modified if read-write mount. */
- if (flags & WIMLIB_MOUNT_FLAG_READWRITE)
+ if (mount_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");
ctx.next_ino = assign_inode_numbers(&imd->inode_list);
DEBUG("(next_ino = %"PRIu64")", ctx.next_ino);
- /* Finish initializing the filesystem context. */
- ctx.wim = wim;
- ctx.mount_flags = flags;
DEBUG("Calling fuse_main()");
FREE(dir_copy);
out_free_message_queue_names:
free_message_queue_names(&ctx);
-out_free_working_directory:
- FREE(ctx.working_directory);
- ctx.working_directory = NULL;
out:
if (num_additional_swms) {
free_lookup_table(wim->lookup_table);
/*
* Unmounts the WIM file that was previously mounted on @dir by using
- * wimlib_mount().
+ * wimlib_mount_image().
*/
-WIMLIBAPI int wimlib_unmount(const char *dir, int flags)
+WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
+ wimlib_progress_func_t progress_func)
{
pid_t pid;
int status;
/* 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;
+ msg[0] = (unmount_flags & WIMLIB_UNMOUNT_FLAG_COMMIT) ? 1 : 0;
+ msg[1] = (unmount_flags & WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY) ? 1 : 0;
DEBUG("Sending message: %scommit, %scheck",
(msg[0] ? "" : "don't "),
return WIMLIB_ERR_UNSUPPORTED;
}
-WIMLIBAPI int wimlib_unmount(const char *dir, int flags)
+WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
+ wimlib_progress_func_t progress_func)
{
return mount_unsupported_error();
}
-WIMLIBAPI int wimlib_mount(WIMStruct *wim_p, int image, const char *dir,
- int flags, WIMStruct **additional_swms,
- unsigned num_additional_swms)
+WIMLIBAPI int wimlib_mount_image(WIMStruct *wim_p, int image, const char *dir,
+ int mount_flags, WIMStruct **additional_swms,
+ unsigned num_additional_swms,
+ const char *staging_dir)
{
return mount_unsupported_error();
}
git://wimlib.net / wimlib / blobdiff