X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=e1ff886f583d89298eacd851e3da8d61bf528dd6;hp=1578353fe9ea21c560568b2e146dda78861b8767;hb=b5b9681794d1f5f13350e3567f6f6e74f5c779cf;hpb=bde1c17816c7ed97c236158e2f1359bb34af08bf

diff --git a/src/mount_image.c b/src/mount_image.c
index 1578353f..e1ff886f 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -46,6 +46,7 @@
 #include "wimlib/lookup_table.h"
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
+#include "wimlib/progress.h"
 #include "wimlib/reparse.h"
 #include "wimlib/resource.h"
 #include "wimlib/timestamp.h"
@@ -341,16 +342,9 @@ create_dentry(struct fuse_context *fuse_ctx, const char *path,
 	new->d_inode->i_attributes = attributes;
 
 	if (wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
-		if (inode_set_unix_data(new->d_inode,
-					fuse_ctx->uid,
-					fuse_ctx->gid,
-					fuse_mask_mode(mode, fuse_ctx),
-					wimfs_ctx->wim->lookup_table,
-					UNIX_DATA_ALL | UNIX_DATA_CREATE))
-		{
-			free_dentry(new);
-			return -ENOMEM;
-		}
+		new->d_inode->i_unix_data.uid = fuse_ctx->uid;
+		new->d_inode->i_unix_data.gid = fuse_ctx->gid;
+		new->d_inode->i_unix_data.mode = fuse_mask_mode(mode, fuse_ctx);
 	}
 	dentry_add_child(parent, new);
 	list_add_tail(&new->d_inode->i_list, wimfs_ctx->image_inode_list);
@@ -389,14 +383,20 @@ remove_dentry(struct wim_dentry *dentry,
 }
 
 static mode_t
-inode_default_unix_mode(const struct wim_inode *inode)
+inode_unix_file_type(const struct wim_inode *inode)
 {
 	if (inode_is_symlink(inode))
-		return S_IFLNK | 0777;
+		return S_IFLNK;
 	else if (inode_is_directory(inode))
-		return S_IFDIR | 0777;
+		return S_IFDIR;
 	else
-		return S_IFREG | 0777;
+		return S_IFREG;
+}
+
+static mode_t
+inode_default_unix_mode(const struct wim_inode *inode)
+{
+	return inode_unix_file_type(inode) | 0777;
 }
 
 /* Transfers file attributes from a struct wim_inode to a `stat' buffer.
@@ -412,16 +412,16 @@ inode_to_stbuf(const struct wim_inode *inode,
 	const struct wimfs_context *ctx = wimfs_get_context();
 
 	memset(stbuf, 0, sizeof(struct stat));
-	stbuf->st_mode = inode_default_unix_mode(inode);
-	stbuf->st_uid = ctx->default_uid;
-	stbuf->st_gid = ctx->default_gid;
-	if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
-		struct wimlib_unix_data unix_data;
-		if (inode_get_unix_data(inode, &unix_data, NULL) == 0) {
-			stbuf->st_uid = unix_data.uid;
-			stbuf->st_gid = unix_data.gid;
-			stbuf->st_mode = unix_data.mode;
-		}
+	if ((ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) &&
+	    inode_has_unix_data(inode))
+	{
+		stbuf->st_uid = inode->i_unix_data.uid;
+		stbuf->st_gid = inode->i_unix_data.gid;
+		stbuf->st_mode = inode->i_unix_data.mode;
+	} else {
+		stbuf->st_uid = ctx->default_uid;
+		stbuf->st_gid = ctx->default_gid;
+		stbuf->st_mode = inode_default_unix_mode(inode);
 	}
 	stbuf->st_ino = (ino_t)inode->i_ino;
 	stbuf->st_nlink = inode->i_nlink;
@@ -799,8 +799,7 @@ inode_close_fds(struct wim_inode *inode)
 
 /* Overwrites the WIM file, with changes saved. */
 static int
-rebuild_wim(struct wimfs_context *ctx, int write_flags,
-	    wimlib_progress_func_t progress_func)
+rebuild_wim(struct wimfs_context *ctx, int write_flags)
 {
 	int ret;
 	struct wim_lookup_table_entry *lte, *tmp;
@@ -827,7 +826,7 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags,
 	}
 
 	xml_update_image_info(wim, wim->current_image);
-	ret = wimlib_overwrite(wim, write_flags, 0, progress_func);
+	ret = wimlib_overwrite(wim, write_flags, 0);
 	if (ret)
 		ERROR("Failed to commit changes to mounted WIM image");
 	return ret;
@@ -1079,7 +1078,8 @@ struct unmount_msg_handler_context {
 	pid_t daemon_pid;
 	int mount_flags;
 	int status;
-	wimlib_progress_func_t progress_func;
+	wimlib_progress_func_t progfunc;
+	void *progctx;
 };
 
 struct daemon_msg_handler_context {
@@ -1151,9 +1151,9 @@ send_unmount_finished_msg(mqd_t mq, int status)
 		ERROR_WITH_ERRNO("Failed to send status to unmount process");
 }
 
-static int
+static enum wimlib_progress_status
 unmount_progress_func(enum wimlib_progress_msg msg,
-		      const union wimlib_progress_info *info)
+		      union wimlib_progress_info *info, void *_ignored_context)
 {
 	if (msg == WIMLIB_PROGRESS_MSG_WRITE_STREAMS) {
 		struct msg_write_streams_progress msg = {
@@ -1172,7 +1172,7 @@ unmount_progress_func(enum wimlib_progress_msg msg,
 					 "to unmount process");
 		}
 	}
-	return 0;
+	return WIMLIB_PROGRESS_STATUS_CONTINUE;
 }
 
 static void
@@ -1258,7 +1258,6 @@ msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
 	int status = 0;
 	int ret;
 	int unmount_flags;
-	wimlib_progress_func_t progress_func;
 
 	DEBUG("Handling unmount request msg");
 
@@ -1269,10 +1268,11 @@ msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
 	}
 
 	unmount_flags = msg->unmount_flags;
-	if (msg->want_progress_messages)
-		progress_func = unmount_progress_func;
-	else
-		progress_func = NULL;
+
+	wimlib_register_progress_function(wimfs_ctx->wim,
+					  (msg->want_progress_messages ?
+					   unmount_progress_func : NULL),
+					  NULL);
 
 	ret = send_daemon_info_msg(wimfs_ctx->daemon_to_unmount_mq, getpid(),
 				   wimfs_ctx->mount_flags);
@@ -1302,8 +1302,7 @@ msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
 				write_flags |= WIMLIB_WRITE_FLAG_REBUILD;
 			if (unmount_flags & WIMLIB_UNMOUNT_FLAG_RECOMPRESS)
 				write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
-			status = rebuild_wim(wimfs_ctx, write_flags,
-					     progress_func);
+			status = rebuild_wim(wimfs_ctx, write_flags);
 		}
 	} else {
 		DEBUG("Read-only mount");
@@ -1350,11 +1349,10 @@ msg_write_streams_progress_handler(const void *_msg, void *_handler_ctx)
 
 	if (msg->hdr.msg_size < sizeof(*msg))
 		return WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE;
-	if (handler_ctx->progress_func) {
-		handler_ctx->progress_func(WIMLIB_PROGRESS_MSG_WRITE_STREAMS,
-					   &msg->info);
-	}
-	return 0;
+	return call_progress(handler_ctx->progfunc,
+			     WIMLIB_PROGRESS_MSG_WRITE_STREAMS,
+			     (union wimlib_progress_info *)&msg->info,
+			     handler_ctx->progctx);
 }
 
 static int
@@ -1609,6 +1607,7 @@ static int
 wimfs_chmod(const char *path, mode_t mask)
 {
 	struct wim_dentry *dentry;
+	struct wim_inode *inode;
 	struct wimfs_context *ctx = wimfs_get_context();
 	int ret;
 
@@ -1620,16 +1619,21 @@ wimfs_chmod(const char *path, mode_t mask)
 	if (ret)
 		return ret;
 
-	ret = inode_set_unix_data(dentry->d_inode, ctx->default_uid,
-				  ctx->default_gid, mask,
-				  ctx->wim->lookup_table, UNIX_DATA_MODE);
-	return ret ? -ENOMEM : 0;
+	inode = dentry->d_inode;
+
+	if (!inode_has_unix_data(inode)) {
+		inode->i_unix_data.uid = ctx->default_uid;
+		inode->i_unix_data.gid = ctx->default_gid;
+	}
+	inode->i_unix_data.mode = mask;
+	return 0;
 }
 
 static int
 wimfs_chown(const char *path, uid_t uid, gid_t gid)
 {
 	struct wim_dentry *dentry;
+	struct wim_inode *inode;
 	struct wimfs_context *ctx = wimfs_get_context();
 	int ret;
 
@@ -1641,11 +1645,13 @@ wimfs_chown(const char *path, uid_t uid, gid_t gid)
 	if (ret)
 		return ret;
 
-	ret = inode_set_unix_data(dentry->d_inode, uid, gid,
-				  inode_default_unix_mode(dentry->d_inode),
-				  ctx->wim->lookup_table,
-				  UNIX_DATA_UID | UNIX_DATA_GID);
-	return ret ? -ENOMEM : 0;
+	inode = dentry->d_inode;
+
+	if (!inode_has_unix_data(inode))
+		inode->i_unix_data.mode = inode_default_unix_mode(inode);
+	inode->i_unix_data.uid = uid;
+	inode->i_unix_data.gid = gid;
+	return 0;
 }
 
 /* Called when the filesystem is unmounted. */
@@ -2668,8 +2674,8 @@ out_free_message_queue_names:
 
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
-wimlib_unmount_image(const char *dir, int unmount_flags,
-		     wimlib_progress_func_t progress_func)
+wimlib_unmount_image_with_progress(const tchar *dir, int unmount_flags,
+				   wimlib_progress_func_t progfunc, void *progctx)
 {
 	int ret;
 	struct wimfs_context wimfs_ctx;
@@ -2694,7 +2700,7 @@ wimlib_unmount_image(const char *dir, int unmount_flags,
 
 	ret = send_unmount_request_msg(wimfs_ctx.unmount_to_daemon_mq,
 				       unmount_flags,
-				       progress_func != NULL);
+				       progfunc != NULL);
 	if (ret != 0)
 		goto out_close_message_queues;
 
@@ -2707,7 +2713,8 @@ wimlib_unmount_image(const char *dir, int unmount_flags,
 			.timeout_seconds = 5,
 		},
 		.daemon_pid = 0,
-		.progress_func = progress_func,
+		.progfunc = progfunc,
+		.progctx = progctx,
 	};
 
 	ret = message_loop(wimfs_ctx.daemon_to_unmount_mq,
@@ -2739,8 +2746,8 @@ mount_unsupported_error(void)
 }
 
 WIMLIBAPI int
-wimlib_unmount_image(const tchar *dir, int unmount_flags,
-		     wimlib_progress_func_t progress_func)
+wimlib_unmount_image_with_progress(const tchar *dir, int unmount_flags,
+				   wimlib_progress_func_t progfunc, void *progctx)
 {
 	return mount_unsupported_error();
 }
@@ -2753,3 +2760,10 @@ wimlib_mount_image(WIMStruct *wim, int image, const tchar *dir,
 }
 
 #endif /* !WITH_FUSE */
+
+
+WIMLIBAPI int
+wimlib_unmount_image(const tchar *dir, int unmount_flags)
+{
+	return wimlib_unmount_image_with_progress(dir, unmount_flags, NULL, NULL);
+}