X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmount_image.c;h=ac914618cd5166fe8851545998fad613ccf113da;hb=4eb18e0c42c31de268f428c355f7a661f614a80f;hp=d0b5d2c8c3977361da2c023cfb17fc5eb4b76540;hpb=7ce0d372fae285051cbc9740c9fa316d22465d9d;p=wimlib

diff --git a/src/mount_image.c b/src/mount_image.c
index d0b5d2c8..ac914618 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -26,7 +26,12 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/error.h"
 
 #ifdef WITH_FUSE
 
@@ -34,11 +39,18 @@
 #  error "FUSE mount not supported on Win32!  Please configure --without-fuse"
 #endif
 
-#include "buffer_io.h"
-#include "lookup_table.h"
-#include "sha1.h"
-#include "timestamp.h"
-#include "xml.h"
+#include "wimlib/encoding.h"
+#include "wimlib/file_io.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#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"
+#include "wimlib/xml.h"
 
 #include <errno.h>
 #include <ftw.h>
@@ -130,13 +142,13 @@ init_wimfs_context(struct wimfs_context *ctx)
 #define WIMFS_CTX(fuse_ctx) ((struct wimfs_context*)(fuse_ctx)->private_data)
 
 static inline struct wimfs_context *
-wimfs_get_context()
+wimfs_get_context(void)
 {
 	return WIMFS_CTX(fuse_get_context());
 }
 
 static inline WIMStruct *
-wimfs_get_WIMStruct()
+wimfs_get_WIMStruct(void)
 {
 	return wimfs_get_context()->wim;
 }
@@ -182,8 +194,6 @@ alloc_wimfs_fd(struct wim_inode *inode,
 	static const u16 max_fds = 0xffff;
 	int ret;
 
-	pthread_mutex_lock(&inode->i_mutex);
-
 	DEBUG("Allocating fd for stream ID %u from inode %#"PRIx64" "
 	      "(open = %u, allocated = %u)",
 	      stream_id, inode->i_ino, inode->i_num_opened_fds,
@@ -235,7 +245,6 @@ alloc_wimfs_fd(struct wim_inode *inode,
 		}
 	}
 out:
-	pthread_mutex_unlock(&inode->i_mutex);
 	return ret;
 }
 
@@ -243,9 +252,6 @@ static void
 inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 {
 	wimlib_assert(inode != NULL);
-
-	pthread_mutex_lock(&inode->i_mutex);
-
 	wimlib_assert(fd->f_inode == inode);
 	wimlib_assert(inode->i_num_opened_fds != 0);
 	wimlib_assert(fd->idx < inode->i_num_allocated_fds);
@@ -253,11 +259,12 @@ inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 
 	inode->i_fds[fd->idx] = NULL;
 	FREE(fd);
-	if (--inode->i_num_opened_fds == 0 && inode->i_nlink == 0) {
-		pthread_mutex_unlock(&inode->i_mutex);
-		free_inode(inode);
-	} else {
-		pthread_mutex_unlock(&inode->i_mutex);
+	if (--inode->i_num_opened_fds == 0) {
+		FREE(inode->i_fds);
+		inode->i_fds = NULL;
+		inode->i_num_allocated_fds = 0;
+		if (inode->i_nlink == 0)
+			free_inode(inode);
 	}
 }
 
@@ -299,6 +306,15 @@ close_wimfs_fd(struct wimfs_fd *fd)
 	return 0;
 }
 
+static mode_t
+fuse_mask_mode(mode_t mode, struct fuse_context *fuse_ctx)
+{
+#if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8)
+	mode &= ~fuse_ctx->umask;
+#endif
+	return mode;
+}
+
 /*
  * Add a new dentry with a new inode to a WIM image.
  *
@@ -337,7 +353,7 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
 		if (inode_set_unix_data(new->d_inode,
 					fuse_ctx->uid,
 					fuse_ctx->gid,
-					mode & ~fuse_ctx->umask,
+					fuse_mask_mode(mode, fuse_ctx),
 					wimfs_ctx->wim->lookup_table,
 					UNIX_DATA_ALL | UNIX_DATA_CREATE))
 		{
@@ -645,11 +661,11 @@ 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;
 	new_lte->resource_entry.original_size = size;
 
 	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:
@@ -796,7 +812,7 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags,
 
 	DEBUG("Closing all staging file descriptors.");
 	image_for_each_unhashed_stream_safe(lte, tmp, imd) {
-		ret = inode_close_fds(lte->lte_inode);
+		ret = inode_close_fds(lte->back_inode);
 		if (ret)
 			return ret;
 	}
@@ -805,7 +821,6 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags,
 	image_for_each_unhashed_stream_safe(lte, tmp, imd) {
 		wimlib_assert(lte->unhashed);
 		if (wim_resource_size(lte) == 0) {
-			print_lookup_table_entry(lte, stderr);
 			struct wim_lookup_table_entry **back_ptr;
 			back_ptr = retrieve_lte_pointer(lte);
 			*back_ptr = NULL;
@@ -1026,29 +1041,29 @@ struct unmount_msg_hdr {
 	u32 cur_version;
 	u32 msg_type;
 	u32 msg_size;
-} PACKED;
+} _packed_attribute;
 
 struct msg_unmount_request {
 	struct unmount_msg_hdr hdr;
 	u32 unmount_flags;
 	u8 want_progress_messages;
-} PACKED;
+} _packed_attribute;
 
 struct msg_daemon_info {
 	struct unmount_msg_hdr hdr;
 	pid_t daemon_pid;
 	u32 mount_flags;
-} PACKED;
+} _packed_attribute;
 
 struct msg_unmount_finished {
 	struct unmount_msg_hdr hdr;
-	int32_t status;
-} PACKED;
+	s32 status;
+} _packed_attribute;
 
 struct msg_write_streams_progress {
 	struct unmount_msg_hdr hdr;
 	union wimlib_progress_info info;
-} PACKED;
+} _packed_attribute;
 
 enum {
 	MSG_TYPE_UNMOUNT_REQUEST,
@@ -1424,7 +1439,7 @@ message_loop(mqd_t mq,
  *  daemon to finish writing the WIM file.
  */
 static int
-execute_fusermount(const char *dir)
+execute_fusermount(const char *dir, bool lazy)
 {
 	pid_t pid;
 	int ret;
@@ -1437,7 +1452,15 @@ execute_fusermount(const char *dir)
 	}
 	if (pid == 0) {
 		/* Child */
-		execlp("fusermount", "fusermount", "-u", dir, NULL);
+		char *argv[10];
+		char **argp = argv;
+		*argp++ = "fusermount";
+		if (lazy)
+			*argp++ = "-z";
+		*argp++ = "-u";
+		*argp++ = (char*)dir;
+		*argp = NULL;
+		execvp("fusermount", argv);
 		ERROR_WITH_ERRNO("Failed to execute `fusermount'");
 		exit(WIMLIB_ERR_FUSERMOUNT);
 	}
@@ -1475,7 +1498,14 @@ execute_fusermount(const char *dir)
 	}
 	if (pid == 0) {
 		/* Child */
-		execlp("umount", "umount", dir, NULL);
+		char *argv[10];
+		char **argp = argv;
+		*argp++ = "umount";
+		if (lazy)
+			*argp++ = "-l";
+		*argp++ = (char*)dir;
+		*argp = NULL;
+		execvp("umount", argv);
 		ERROR_WITH_ERRNO("Failed to execute `umount'");
 		exit(WIMLIB_ERR_FUSERMOUNT);
 	}
@@ -1494,13 +1524,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)
 {
@@ -1562,17 +1585,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)
@@ -1649,8 +1661,8 @@ wimfs_getxattr(const char *path, const char *name, char *value,
 	if (res_size > size)
 		return -ERANGE;
 
-	ret = read_full_resource_into_buf(lte, value, true);
-	if (ret != 0)
+	ret = read_full_resource_into_buf(lte, value);
+	if (ret)
 		return -EIO;
 
 	return res_size;
@@ -1810,7 +1822,7 @@ wimfs_open(const char *path, struct fuse_file_info *fi)
 
 	ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
 			      &dentry, &lte, &stream_idx);
-	if (ret != 0)
+	if (ret)
 		return ret;
 
 	inode = dentry->d_inode;
@@ -1835,15 +1847,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,
 						      &lte, size, ctx);
-		if (ret != 0)
+		if (ret)
 			return ret;
 		*back_ptr = lte;
 	}
-	print_lookup_table_entry(lte, stderr);
 
 	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) {
@@ -1893,26 +1904,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))
+						       offset, buf))
 			ret = -errno;
-		ret = size;
+		else
+			ret = size;
 		break;
 	case RESOURCE_IN_ATTACHED_BUFFER:
 		memcpy(buf, fd->f_lte->attached_buffer + offset, size);
@@ -1989,10 +2007,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;
 }
 
@@ -2045,58 +2069,7 @@ wimfs_removexattr(const char *path, const char *name)
 static int
 wimfs_rename(const char *from, const char *to)
 {
-	struct wim_dentry *src;
-	struct wim_dentry *dst;
-	struct wim_dentry *parent_of_dst;
-	WIMStruct *w = wimfs_get_WIMStruct();
-	int ret;
-
-	/* This rename() implementation currently only supports actual files
-	 * (not alternate data streams) */
-
-	src = get_dentry(w, from);
-	if (!src)
-		return -errno;
-
-	dst = get_dentry(w, to);
-
-	if (dst) {
-		/* Destination file exists */
-
-		if (src == dst) /* Same file */
-			return 0;
-
-		if (!dentry_is_directory(src)) {
-			/* Cannot rename non-directory to directory. */
-			if (dentry_is_directory(dst))
-				return -EISDIR;
-		} else {
-			/* Cannot rename directory to a non-directory or a non-empty
-			 * directory */
-			if (!dentry_is_directory(dst))
-				return -ENOTDIR;
-			if (inode_has_children(dst->d_inode))
-				return -ENOTEMPTY;
-		}
-		parent_of_dst = dst->parent;
-	} else {
-		/* Destination does not exist */
-		parent_of_dst = get_parent_dentry(w, to);
-		if (!parent_of_dst)
-			return -errno;
-
-		if (!dentry_is_directory(parent_of_dst))
-			return -ENOTDIR;
-	}
-
-	ret = set_dentry_name(src, path_basename(to));
-	if (ret != 0)
-		return -ENOMEM;
-	if (dst)
-		remove_dentry(dst, w->lookup_table);
-	unlink_dentry(src);
-	dentry_add_child(parent_of_dst, src);
-	return 0;
+	return rename_wim_path(wimfs_get_WIMStruct(), from, to);
 }
 
 /* Remove a directory */
@@ -2176,11 +2149,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;
@@ -2217,13 +2193,19 @@ wimfs_truncate(const char *path, off_t 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)
+		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;
+		}
 		ret = extract_resource_to_staging_dir(inode, stream_id,
 						      &lte, size, ctx);
+		*back_ptr = lte;
 	}
 	return ret;
 }
@@ -2322,8 +2304,8 @@ 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 */
@@ -2340,15 +2322,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,
@@ -2410,7 +2386,6 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	char *argv[16];
 	int ret;
 	char *dir_copy;
-	struct wim_lookup_table *joined_tab, *wim_tab_save;
 	struct wim_image_metadata *imd;
 	struct wimfs_context ctx;
 	struct wim_inode *inode;
@@ -2418,41 +2393,27 @@ 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)
-		return WIMLIB_ERR_INVALID_PARAM;
+	if (!wim || !dir) {
+		ret = WIMLIB_ERR_INVALID_PARAM;
+		goto out;
+	}
 
 	ret = verify_swm_set(wim, additional_swms, num_additional_swms);
 	if (ret)
-		return ret;
-
-	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;
-	}
-
-	if (num_additional_swms) {
-		ret = new_joined_lookup_table(wim, additional_swms,
-					      num_additional_swms,
-					      &joined_tab);
-		if (ret)
-			return ret;
-		wim_tab_save = wim->lookup_table;
-		wim->lookup_table = joined_tab;
-	}
+		goto out;
 
 	if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
-		ret = wim_run_full_verifications(wim);
+		ret = can_delete_from_wim(wim);
 		if (ret)
 			goto out;
 	}
 
-	ret = wim_checksum_unhashed_streams(wim);
-	if (ret)
-		goto out;
+	if (num_additional_swms)
+		merge_lookup_tables(wim, additional_swms, num_additional_swms);
 
 	ret = select_wim_image(wim, image);
 	if (ret)
-		goto out;
+		goto out_restore_lookup_table;
 
 	DEBUG("Selected image %d", image);
 
@@ -2462,20 +2423,20 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 		ERROR("Cannot mount image that was just exported with "
 		      "wimlib_export_image()");
 		ret = WIMLIB_ERR_INVALID_PARAM;
-		goto out;
+		goto out_restore_lookup_table;
 	}
 
 	if (imd->modified) {
 		ERROR("Cannot mount image that was added "
 		      "with wimlib_add_image()");
 		ret = WIMLIB_ERR_INVALID_PARAM;
-		goto out;
+		goto out_restore_lookup_table;
 	}
 
 	if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
-		ret = lock_wim(wim, wim->fp);
+		ret = lock_wim(wim, wim->in_fd);
 		if (ret)
-			goto out;
+			goto out_restore_lookup_table;
 	}
 
 	/* Use default stream interface if one was not specified */
@@ -2484,7 +2445,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;
@@ -2510,12 +2470,11 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 		goto out_free_message_queue_names;
 
 	argc = 0;
-	argv[argc++] = "imagex";
+	argv[argc++] = IMAGEX_PROGNAME;
 	argv[argc++] = dir_copy;
 
- 	/* disable multi-threaded operation for read-write mounts */
-	if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
-		argv[argc++] = "-s";
+	/* disable multi-threaded operation */
+	argv[argc++] = "-s";
 
 	if (mount_flags & WIMLIB_MOUNT_FLAG_DEBUG)
 		argv[argc++] = "-d";
@@ -2561,19 +2520,15 @@ 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 */
 	DEBUG("Resolving lookup table entries and assigning inode numbers");
 	ctx.next_ino = 1;
-	image_for_each_inode(inode, imd) {
-		inode_resolve_ltes(inode, wim->lookup_table);
+	image_for_each_inode(inode, imd)
 		inode->i_ino = ctx.next_ino++;
-	}
 	DEBUG("(next_ino = %"PRIu64")", ctx.next_ino);
 
 	DEBUG("Calling fuse_main()");
@@ -2605,11 +2560,10 @@ 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:
-	if (num_additional_swms) {
-		free_lookup_table(wim->lookup_table);
-		wim->lookup_table = wim_tab_save;
-	}
 	return ret;
 }
 
@@ -2640,7 +2594,7 @@ wimlib_unmount_image(const char *dir, int unmount_flags,
 	if (ret != 0)
 		goto out_close_message_queues;
 
-	ret = execute_fusermount(dir);
+	ret = execute_fusermount(dir, (unmount_flags & WIMLIB_UNMOUNT_FLAG_LAZY) != 0);
 	if (ret != 0)
 		goto out_close_message_queues;
 
@@ -2669,7 +2623,7 @@ out:
 
 
 static int
-mount_unsupported_error()
+mount_unsupported_error(void)
 {
 #if defined(__WIN32__)
 	ERROR("Sorry-- Mounting WIM images is not supported on Windows!");