X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount.c;h=6f50a4e5931d5d2b59a8dace45422edb7fb92b23;hp=82abe7d90b4640e29742facfcd6aac0539bb9ba2;hb=512d3f87a1e7b59ca19ae6d6965dbcf7f4a17c15;hpb=ed828dc4cbf4eabc9f8b32cb4c6a86a04e087f7a

diff --git a/src/mount.c b/src/mount.c
index 82abe7d9..6f50a4e5 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -13,16 +13,16 @@
  * This file is part of wimlib, a library for working with WIM files.
  *
  * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
  * any later version.
  *
  * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
@@ -44,7 +44,10 @@
 #include <fuse.h>
 #include <ftw.h>
 #include <mqueue.h>
+
+#ifdef ENABLE_XATTR
 #include <attr/xattr.h>
+#endif
 
 struct wimlib_fd {
 	u16 idx;
@@ -950,10 +953,11 @@ done:
 	close_message_queues();
 }
 
+#if 0
 static int wimfs_fallocate(const char *path, int mode,
 			   off_t offset, off_t len, struct fuse_file_info *fi)
 {
-	struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+	struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
 	wimlib_assert(fd->staging_fd != -1);
 	return fallocate(fd->staging_fd, mode, offset, len);
 }
@@ -961,14 +965,15 @@ static int wimfs_fallocate(const char *path, int mode,
 static int wimfs_fgetattr(const char *path, struct stat *stbuf,
 			  struct fuse_file_info *fi)
 {
-	struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+	struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
 	return dentry_to_stbuf(fd->dentry, stbuf);
 }
+#endif
 
 static int wimfs_ftruncate(const char *path, off_t size,
 			   struct fuse_file_info *fi)
 {
-	struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+	struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
 	int ret = ftruncate(fd->staging_fd, size);
 	if (ret != 0)
 		return ret;
@@ -992,6 +997,7 @@ static int wimfs_getattr(const char *path, struct stat *stbuf)
 	return dentry_to_stbuf(dentry, stbuf);
 }
 
+#ifdef ENABLE_XATTR
 /* Read an alternate data stream through the XATTR interface, or get its size */
 static int wimfs_getxattr(const char *path, const char *name, char *value,
 			  size_t size)
@@ -1028,6 +1034,7 @@ static int wimfs_getxattr(const char *path, const char *name, char *value,
 		return -EIO;
 	return res_size;
 }
+#endif
 
 /* Create a hard link */
 static int wimfs_link(const char *to, const char *from)
@@ -1081,6 +1088,7 @@ static int wimfs_link(const char *to, const char *from)
 	return 0;
 }
 
+#ifdef ENABLE_XATTR
 static int wimfs_listxattr(const char *path, char *list, size_t size)
 {
 	struct dentry *dentry;
@@ -1113,6 +1121,7 @@ static int wimfs_listxattr(const char *path, char *list, size_t size)
 		return p - list;
 	}
 }
+#endif
 
 /* 
  * Create a directory in the WIM.  
@@ -1255,7 +1264,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 			return -errno;
 		}
 	}
-	fi->fh = (uint64_t)fd;
+	fi->fh = (uintptr_t)fd;
 	return 0;
 }
 
@@ -1270,7 +1279,7 @@ static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
 	if (!dentry_is_directory(dentry))
 		return -ENOTDIR;
 	dentry->num_times_opened++;
-	fi->fh = (uint64_t)dentry;
+	fi->fh = (uintptr_t)dentry;
 	return 0;
 }
 
@@ -1281,7 +1290,7 @@ static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
 static int wimfs_read(const char *path, char *buf, size_t size, 
 		      off_t offset, struct fuse_file_info *fi)
 {
-	struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+	struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
 
 	if (!fd) {
 		/* Empty file with no lookup table entry on read-only mounted
@@ -1333,7 +1342,7 @@ static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 {
 	struct dentry *parent, *child;
 	
-	parent = (struct dentry*)fi->fh;
+	parent = (struct dentry*)(uintptr_t)fi->fh;
 	wimlib_assert(parent);
 	child = parent->children;
 
@@ -1370,7 +1379,7 @@ static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
 /* Close a file. */
 static int wimfs_release(const char *path, struct fuse_file_info *fi)
 {
-	struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+	struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
 
 	if (!fd) {
 		/* Empty file with no lookup table entry on read-only mounted
@@ -1390,7 +1399,7 @@ static int wimfs_release(const char *path, struct fuse_file_info *fi)
 
 static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
 {
-	struct dentry *dentry = (struct dentry *)fi->fh;
+	struct dentry *dentry = (struct dentry *)(uintptr_t)fi->fh;
 
 	wimlib_assert(dentry);
 	wimlib_assert(dentry->num_times_opened);
@@ -1399,6 +1408,7 @@ static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
 	return 0;
 }
 
+#ifdef ENABLE_XATTR
 /* Remove an alternate data stream through the XATTR interface */
 static int wimfs_removexattr(const char *path, const char *name)
 {
@@ -1421,6 +1431,7 @@ static int wimfs_removexattr(const char *path, const char *name)
 	remove_ads(dentry, ads_entry, w->lookup_table);
 	return 0;
 }
+#endif
 
 /* Renames a file or directory.  See rename (3) */
 static int wimfs_rename(const char *from, const char *to)
@@ -1508,6 +1519,7 @@ static int wimfs_rmdir(const char *path)
 	return 0;
 }
 
+#ifdef ENABLE_XATTR
 /* Write an alternate data stream through the XATTR interface */
 static int wimfs_setxattr(const char *path, const char *name,
 			  const char *value, size_t size, int flags)
@@ -1571,6 +1583,7 @@ static int wimfs_setxattr(const char *path, const char *name,
 	new_ads_entry->lte = lte;
 	return 0;
 }
+#endif
 
 static int wimfs_symlink(const char *to, const char *from)
 {
@@ -1706,7 +1719,7 @@ static int wimfs_utimens(const char *path, const struct timespec tv[2])
 static int wimfs_write(const char *path, const char *buf, size_t size, 
 		       off_t offset, struct fuse_file_info *fi)
 {
-	struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+	struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
 	int ret;
 
 	wimlib_assert(fd);
@@ -1729,13 +1742,19 @@ static int wimfs_write(const char *path, const char *buf, size_t size,
 static struct fuse_operations wimfs_operations = {
 	.access      = wimfs_access,
 	.destroy     = wimfs_destroy,
+#if 0
 	.fallocate   = wimfs_fallocate,
 	.fgetattr    = wimfs_fgetattr,
+#endif
 	.ftruncate   = wimfs_ftruncate,
 	.getattr     = wimfs_getattr,
+#ifdef ENABLE_XATTR
 	.getxattr    = wimfs_getxattr,
+#endif
 	.link        = wimfs_link,
+#ifdef ENABLE_XATTR
 	.listxattr   = wimfs_listxattr,
+#endif
 	.mkdir       = wimfs_mkdir,
 	.mknod       = wimfs_mknod,
 	.open        = wimfs_open,
@@ -1745,10 +1764,14 @@ static struct fuse_operations wimfs_operations = {
 	.readlink    = wimfs_readlink,
 	.release     = wimfs_release,
 	.releasedir  = wimfs_releasedir,
+#ifdef ENABLE_XATTR
 	.removexattr = wimfs_removexattr,
+#endif
 	.rename      = wimfs_rename,
 	.rmdir       = wimfs_rmdir,
+#ifdef ENABLE_XATTR
 	.setxattr    = wimfs_setxattr,
+#endif
 	.symlink     = wimfs_symlink,
 	.truncate    = wimfs_truncate,
 	.unlink      = wimfs_unlink,
@@ -1799,35 +1822,54 @@ static int check_lte_refcnt(struct lookup_table_entry *lte, void *ignore)
 
 /* Mounts a WIM file. */
 WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, 
-			   int flags)
+			   int flags, WIMStruct **additional_swms,
+			   unsigned num_additional_swms)
 {
 	int argc = 0;
 	char *argv[16];
 	int ret;
 	char *p;
+	struct lookup_table *joined_tab, *wim_tab_save;
 
 	DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ",
 			wim, image, dir, flags);
 
-	if (!dir)
+	if (!wim || !dir)
 		return WIMLIB_ERR_INVALID_PARAM;
 
+	ret = verify_swm_set(wim, additional_swms, num_additional_swms);
+	if (ret != 0)
+		return ret;
+
+	if (num_additional_swms) {
+		ret = new_joined_lookup_table(wim, additional_swms,
+					      num_additional_swms,
+					      &joined_tab);
+		if (ret != 0)
+			return ret;
+		wim_tab_save = wim->lookup_table;
+		wim->lookup_table = joined_tab;
+	}
+
 	ret = wimlib_select_image(wim, image);
 
 	if (ret != 0)
-		return ret;
+		goto out;
 
 	DEBUG("Selected image %d", image);
 
 	next_link_group_id = assign_link_group_ids(wim->image_metadata[image - 1].lgt);
 
+	DEBUG("Resolving lookup table entries");
 	/* Resolve all the lookup table entries of the dentry tree */
 	for_dentry_in_tree(wim_root_dentry(wim), dentry_resolve_ltes,
 			   wim->lookup_table);
 
+	DEBUG("Checking lookup table entry reference counts");
+
 	ret = for_lookup_table_entry(wim->lookup_table, check_lte_refcnt, NULL);
 	if (ret != 0)
-		return ret;
+		goto out;
 
 	if (flags & WIMLIB_MOUNT_FLAG_READWRITE)
 		wim_get_current_image_metadata(wim)->modified = true;
@@ -1837,16 +1879,33 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
 		       WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)))
 		flags |= WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR;
 
+	DEBUG("Getting current directory");
+
 	mount_dir = dir;
 	working_directory = getcwd(NULL, 0);
 	if (!working_directory) {
 		ERROR_WITH_ERRNO("Could not determine current directory");
-		return WIMLIB_ERR_NOTDIR;
+		ret = WIMLIB_ERR_NOTDIR;
+		goto out;
 	}
 
+	DEBUG("Closing POSIX message queues");
+	/* XXX hack to get rid of the message queues if they already exist for
+	 * some reason (maybe left over from a previous mount that wasn't
+	 * unmounted correctly) */
+	ret = open_message_queues(true);
+	if (ret != 0)
+		goto out;
+	close_message_queues();
+
+	DEBUG("Preparing arguments to fuse_main()");
+
+
 	p = STRDUP(dir);
-	if (!p)
-		return WIMLIB_ERR_NOMEM;
+	if (!p) {
+		ret = WIMLIB_ERR_NOMEM;
+		goto out;
+	}
 
 	argv[argc++] = "imagex";
 	argv[argc++] = p;
@@ -1870,7 +1929,8 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
 		make_staging_dir();
 		if (!staging_dir_name) {
 			FREE(p);
-			return WIMLIB_ERR_MKDIR;
+			ret = WIMLIB_ERR_MKDIR;
+			goto out;
 		}
 	} else {
 		/* Read-only mount */
@@ -1896,8 +1956,14 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
 	mount_flags = flags;
 
 	ret = fuse_main(argc, argv, &wimfs_operations, NULL);
-
-	return (ret == 0) ? 0 : WIMLIB_ERR_FUSE;
+	if (ret)
+		ret = WIMLIB_ERR_FUSE;
+out:
+	if (num_additional_swms) {
+		free_lookup_table(wim->lookup_table);
+		wim->lookup_table = wim_tab_save;
+	}
+	return ret;
 }
 
 
@@ -2037,7 +2103,8 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags)
 }
 
 WIMLIBAPI int wimlib_mount(WIMStruct *wim_p, int image, const char *dir, 
-			   int flags)
+			   int flags, WIMStruct **additional_swms,
+			   unsigned num_additional_swms)
 {
 	return mount_unsupported_error();
 }