X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=7482ceb069106d8829fc83037b16740ae6115d59;hp=37bc68ce0f56efa74d3e29601e516412a19179c6;hb=335e7f84a6ea46ea13e333c7294be0594fc859ca;hpb=69a6de2b04308332d9e5e8bc61f34e4b9460c12f

diff --git a/src/mount_image.c b/src/mount_image.c
index 37bc68ce..7482ceb0 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -41,6 +41,8 @@
 
 #include "wimlib/encoding.h"
 #include "wimlib/file_io.h"
+#include "wimlib/dentry.h"
+#include "wimlib/inode.h"
 #include "wimlib/lookup_table.h"
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
@@ -152,12 +154,6 @@ wimfs_get_WIMStruct(void)
 	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)
 {
@@ -168,7 +164,8 @@ get_lookup_flags(const struct wimfs_context *ctx)
 static inline int
 flags_writable(int open_flags)
 {
-	return open_flags & (O_RDWR | O_WRONLY);
+	int accmode = (open_flags & O_ACCMODE);
+	return (accmode == O_RDWR || accmode == O_WRONLY);
 }
 
 /*
@@ -178,16 +175,14 @@ 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.
+ * Return 0 iff successful or negative error code if unsuccessful.
  */
 static int
 alloc_wimfs_fd(struct wim_inode *inode,
 	       u32 stream_id,
 	       struct wim_lookup_table_entry *lte,
-	       struct wimfs_fd **fd_ret,
-	       bool readonly)
+	       struct wimfs_fd **fd_ret)
 {
 	static const u16 fds_per_alloc = 8;
 	static const u16 max_fds = 0xffff;
@@ -202,20 +197,18 @@ alloc_wimfs_fd(struct wim_inode *inode,
 		struct wimfs_fd **fds;
 		u16 num_new_fds;
 
-		if (inode->i_num_allocated_fds == max_fds) {
-			ret = -EMFILE;
-			goto out;
-		}
+		if (inode->i_num_allocated_fds == max_fds)
+			return -EMFILE;
+
 		num_new_fds = min(fds_per_alloc,
 				  max_fds - inode->i_num_allocated_fds);
 
 		fds = REALLOC(inode->i_fds,
 			      (inode->i_num_allocated_fds + num_new_fds) *
 			        sizeof(inode->i_fds[0]));
-		if (!fds) {
-			ret = -ENOMEM;
-			goto out;
-		}
+		if (!fds)
+			return -ENOMEM;
+
 		memset(&fds[inode->i_num_allocated_fds], 0,
 		       num_new_fds * sizeof(fds[0]));
 		inode->i_fds = fds;
@@ -224,10 +217,9 @@ alloc_wimfs_fd(struct wim_inode *inode,
 	for (u16 i = 0; ; i++) {
 		if (!inode->i_fds[i]) {
 			struct wimfs_fd *fd = CALLOC(1, sizeof(*fd));
-			if (!fd) {
-				ret = -ENOMEM;
-				break;
-			}
+			if (!fd)
+				return -ENOMEM;
+
 			fd->f_inode     = inode;
 			fd->f_lte       = lte;
 			filedes_invalidate(&fd->staging_fd);
@@ -236,15 +228,12 @@ alloc_wimfs_fd(struct wim_inode *inode,
 			*fd_ret         = fd;
 			inode->i_fds[i] = fd;
 			inode->i_num_opened_fds++;
-			if (lte && !readonly)
+			if (lte)
 				lte->num_opened_fds++;
 			DEBUG("Allocated fd (idx = %u)", fd->idx);
-			ret = 0;
-			break;
+			return 0;
 		}
 	}
-out:
-	return ret;
 }
 
 static void
@@ -329,7 +318,7 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
 	struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
 	int ret;
 
-	parent = get_parent_dentry(wimfs_ctx->wim, path);
+	parent = get_parent_dentry(wimfs_ctx->wim, path, WIMLIB_CASE_SENSITIVE);
 	if (!parent)
 		return -errno;
 
@@ -337,7 +326,7 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
 		return -ENOTDIR;
 
 	basename = path_basename(path);
-	if (get_dentry_child_with_name(parent, basename))
+	if (get_dentry_child_with_name(parent, basename, WIMLIB_CASE_SENSITIVE))
 		return -EEXIST;
 
 	ret = new_dentry_with_inode(basename, &new);
@@ -367,6 +356,17 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
 	return 0;
 }
 
+static struct wim_inode *
+wim_pathname_to_inode(WIMStruct *wim, const tchar *path)
+{
+	struct wim_dentry *dentry;
+	dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
+	if (dentry)
+		return dentry->d_inode;
+	else
+		return NULL;
+}
+
 /* Remove a dentry from a mounted WIM image; i.e. remove an alias for the
  * corresponding inode.
  *
@@ -434,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
@@ -568,9 +568,8 @@ extract_resource_to_staging_dir(struct wim_inode *inode,
 	if (old_lte) {
 		struct filedes wimlib_fd;
 		filedes_init(&wimlib_fd, fd);
-		extract_size = min(wim_resource_size(old_lte), size);
-		ret = extract_wim_resource_to_fd(old_lte, &wimlib_fd,
-						 extract_size);
+		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,13 +662,14 @@ 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;
+	lte_put_resource(new_lte);
+	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);
+	add_unhashed_stream(new_lte, inode, stream_id,
+			    &wim_get_current_image_metadata(ctx->wim)->unhashed_streams);
 	*retrieve_lte_pointer(new_lte) = new_lte;
 	*lte = new_lte;
 	return 0;
@@ -825,7 +825,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;
@@ -1294,25 +1294,19 @@ msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
 static int
 unmount_timed_out_cb(void *_handler_ctx)
 {
-	struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
+	const struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
 
-	if (handler_ctx->daemon_pid == 0) {
-		goto out_crashed;
-	} else {
-		kill(handler_ctx->daemon_pid, 0);
-		if (errno == ESRCH) {
-			goto out_crashed;
-		} else {
-			DEBUG("Filesystem daemon is still alive... "
-			      "Waiting another %d seconds\n",
-			      handler_ctx->hdr.timeout_seconds);
-			return 0;
-		}
+	if (handler_ctx->daemon_pid == 0 ||
+	    (kill(handler_ctx->daemon_pid, 0) != 0 && errno == ESRCH))
+	{
+		ERROR("The filesystem daemon has crashed!  Changes to the "
+		      "WIM may not have been commited.");
+		return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
 	}
-out_crashed:
-	ERROR("The filesystem daemon has crashed!  Changes to the "
-	      "WIM may not have been commited.");
-	return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
+
+	DEBUG("Filesystem daemon is still alive... "
+	      "Waiting another %d seconds", handler_ctx->hdr.timeout_seconds);
+	return 0;
 }
 
 static int
@@ -1522,10 +1516,12 @@ execute_fusermount(const char *dir, bool lazy)
 				 "terminate");
 		return WIMLIB_ERR_FUSERMOUNT;
 	}
-	if (status != 0) {
+
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
 		ERROR("`umount' did not successfully complete");
 		return WIMLIB_ERR_FUSERMOUNT;
 	}
+
 	return 0;
 }
 
@@ -1606,7 +1602,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;
 }
 
@@ -1639,7 +1635,7 @@ 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();
 
@@ -1659,22 +1655,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);
+	ret = read_full_stream_into_buf(lte, value);
 	if (ret) {
 		if (errno)
 			return -errno;
 		else
 			return -EIO;
 	}
-	return res_size;
+	return stream_size;
 }
 #endif
 
@@ -1696,14 +1692,15 @@ wimfs_link(const char *to, const char *from)
 				   FILE_ATTRIBUTE_REPARSE_POINT))
 		return -EPERM;
 
-	from_dentry_parent = get_parent_dentry(wim, from);
+	from_dentry_parent = get_parent_dentry(wim, from, WIMLIB_CASE_SENSITIVE);
 	if (!from_dentry_parent)
 		return -errno;
 	if (!dentry_is_directory(from_dentry_parent))
 		return -ENOTDIR;
 
 	link_name = path_basename(from);
-	if (get_dentry_child_with_name(from_dentry_parent, link_name))
+	if (get_dentry_child_with_name(from_dentry_parent, link_name,
+				       WIMLIB_CASE_SENSITIVE))
 		return -EEXIST;
 
 	ret = new_dentry(link_name, &from_dentry);
@@ -1857,7 +1854,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,
 						      &lte, size, ctx);
 		if (ret)
@@ -1865,8 +1862,7 @@ wimfs_open(const char *path, struct fuse_file_info *fi)
 		*back_ptr = lte;
 	}
 
-	ret = alloc_wimfs_fd(inode, stream_id, lte, &fd,
-			     wimfs_ctx_readonly(ctx));
+	ret = alloc_wimfs_fd(inode, stream_id, lte, &fd);
 	if (ret)
 		return ret;
 
@@ -1900,7 +1896,7 @@ wimfs_opendir(const char *path, struct fuse_file_info *fi)
 		return -errno;
 	if (!inode_is_directory(inode))
 		return -ENOTDIR;
-	ret = alloc_wimfs_fd(inode, 0, NULL, &fd, wimfs_ctx_readonly(ctx));
+	ret = alloc_wimfs_fd(inode, 0, NULL, &fd);
 	fi->fh = (uintptr_t)fd;
 	return ret;
 }
@@ -1915,7 +1911,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;
@@ -1924,14 +1920,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;
 
@@ -1942,9 +1938,9 @@ 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))
-			ret = -errno;
+		if (read_partial_wim_stream_into_buf(fd->f_lte, size,
+						     offset, buf))
+			ret = errno ? -errno : -EIO;
 		else
 			ret = size;
 		break;
@@ -2024,7 +2020,7 @@ wimfs_readlink(const char *path, char *buf, size_t buf_len)
 	if (!inode_is_symlink(inode))
 		return -EINVAL;
 	if (buf_len == 0)
-		return -ENAMETOOLONG;
+		return -EINVAL;
 	ret = wim_inode_readlink(inode, buf, buf_len - 1, NULL);
 	if (ret >= 0) {
 		wimlib_assert(ret <= buf_len - 1);
@@ -2085,7 +2081,8 @@ wimfs_removexattr(const char *path, const char *name)
 static int
 wimfs_rename(const char *from, const char *to)
 {
-	return rename_wim_path(wimfs_get_WIMStruct(), from, to);
+	return rename_wim_path(wimfs_get_WIMStruct(), from, to,
+			       WIMLIB_CASE_SENSITIVE);
 }
 
 /* Remove a directory */
@@ -2095,7 +2092,7 @@ wimfs_rmdir(const char *path)
 	struct wim_dentry *dentry;
 	WIMStruct *wim = wimfs_get_WIMStruct();
 
-	dentry = get_dentry(wim, path);
+	dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
 	if (!dentry)
 		return -errno;
 
@@ -2205,7 +2202,7 @@ wimfs_truncate(const char *path, off_t 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. */
@@ -2242,7 +2239,7 @@ wimfs_unlink(const char *path)
 	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,
@@ -2263,7 +2260,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, WIMLIB_CASE_SENSITIVE);
 	if (!dentry)
 		return -errno;
 	inode = dentry->d_inode;
@@ -2290,7 +2287,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, WIMLIB_CASE_SENSITIVE);
 	if (!dentry)
 		return -errno;
 	inode = dentry->d_inode;
@@ -2325,11 +2322,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 */
@@ -2410,6 +2406,15 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	if (!wim || !dir)
 		return WIMLIB_ERR_INVALID_PARAM;
 
+	if (mount_flags & ~(WIMLIB_MOUNT_FLAG_READWRITE |
+			    WIMLIB_MOUNT_FLAG_DEBUG |
+			    WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |
+			    WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR |
+			    WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS |
+			    WIMLIB_MOUNT_FLAG_UNIX_DATA |
+			    WIMLIB_MOUNT_FLAG_ALLOW_OTHER))
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
 		ret = can_delete_from_wim(wim);
 		if (ret)
@@ -2424,15 +2429,12 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 
 	imd = wim_get_current_image_metadata(wim);
 
-	if (imd->refcnt != 1) {
-		ERROR("Cannot mount image that was just exported with "
-		      "wimlib_export_image()");
-		return WIMLIB_ERR_INVALID_PARAM;
-	}
-
 	if (imd->modified) {
-		ERROR("Cannot mount image that was added "
-		      "with wimlib_add_image()");
+		/* wimfs_read() only supports a limited number of stream
+		 * locations, not including RESOURCE_IN_FILE_ON_DISK,
+		 * RESOURCE_IN_NTFS_VOLUME, etc. that might appear if files were
+		 * added to the WIM image.  */
+		ERROR("Cannot mount an image with newly added files!");
 		return WIMLIB_ERR_INVALID_PARAM;
 	}
 
@@ -2456,7 +2458,6 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	ctx.default_uid = getuid();
 	ctx.default_gid = getgid();
 	wimlib_assert(list_empty(&imd->unhashed_streams));
-	ctx.wim->lookup_table->unhashed_streams = &imd->unhashed_streams;
 	if (mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
 		ctx.default_lookup_flags = LOOKUP_FLAG_ADS_OK;
 
@@ -2469,8 +2470,10 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	DEBUG("Preparing arguments to fuse_main()");
 
 	dir_copy = STRDUP(dir);
-	if (!dir_copy)
+	if (!dir_copy) {
+		ret = WIMLIB_ERR_NOMEM;
 		goto out_free_message_queue_names;
+	}
 
 	argc = 0;
 	argv[argc++] = "wimlib";
@@ -2574,6 +2577,13 @@ wimlib_unmount_image(const char *dir, int unmount_flags,
 	int ret;
 	struct wimfs_context wimfs_ctx;
 
+	if (unmount_flags & ~(WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY |
+			      WIMLIB_UNMOUNT_FLAG_COMMIT |
+			      WIMLIB_UNMOUNT_FLAG_REBUILD |
+			      WIMLIB_UNMOUNT_FLAG_RECOMPRESS |
+			      WIMLIB_UNMOUNT_FLAG_LAZY))
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	init_wimfs_context(&wimfs_ctx);
 
 	ret = set_message_queue_names(&wimfs_ctx, dir);