X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount.c;h=289516f7c09921b55298dcc0e6d72b044d091b2f;hp=0588746e91929eb65ab6327e7f5b01eec1846e0a;hb=2a7e6a7d014689899c90a926a095a53753488967;hpb=0fee00b52e5f5eeb140695276afe421a7f4d12a7

diff --git a/src/mount.c b/src/mount.c
index 0588746e..289516f7 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -73,6 +73,10 @@ static int mount_flags;
 /* Name of the directory on which the WIM file is mounted. */
 static const char *mount_dir;
 
+/* Next hard link group ID to be assigned.  These are also used as the inode
+ * numbers. */
+static u64 next_link_group_id;
+
 
 static inline int get_lookup_flags()
 {
@@ -139,13 +143,55 @@ static int close_wimlib_fd(struct wimlib_fd *fd)
 		if (close(fd->staging_fd) != 0)
 			return -errno;
 	}
-	if (--lte->num_opened_fds == 0 && lte->refcnt == 0)
+	if (--lte->num_opened_fds == 0 && lte->refcnt == 0) {
+		if (lte->staging_file_name)
+			unlink(lte->staging_file_name);
 		free_lookup_table_entry(lte);
+	}
 	lte->fds[fd->idx] = NULL;
 	FREE(fd);
 	return 0;
 }
 
+static void remove_dentry(struct dentry *dentry,
+			  struct lookup_table *lookup_table)
+{
+	const u8 *hash = dentry->hash;
+	u16 i = 0;
+	struct lookup_table_entry *lte;
+	while (1) {
+		lte = lookup_table_decrement_refcnt(lookup_table, hash);
+		if (lte && lte->num_opened_fds)
+			for (u16 i = 0; i < lte->num_allocated_fds; i++)
+				if (lte->fds[i] && lte->fds[i]->dentry == dentry)
+					lte->fds[i]->dentry = NULL;
+		if (i == dentry->num_ads)
+			break;
+		hash = dentry->ads_entries[i].hash;
+		i++;
+	}
+
+	unlink_dentry(dentry);
+	put_dentry(dentry);
+}
+
+static void dentry_increment_lookup_table_refcnts(struct dentry *dentry,
+						  struct lookup_table *lookup_table)
+{
+	u16 i = 0;
+	const u8 *hash = dentry->hash;
+	struct lookup_table_entry *lte;
+	while (1) {
+		lte = __lookup_resource(lookup_table, hash);
+		if (lte)
+			lte->refcnt++;
+		if (i == dentry->num_ads)
+			break;
+		hash = dentry->ads_entries[i].hash;
+		i++;
+	}
+}
+
 /* Creates a new staging file and returns its file descriptor opened for
  * writing.
  *
@@ -221,7 +267,9 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
 	int fd;
 	struct lookup_table_entry *old_lte, *new_lte;
 	size_t link_group_size;
-	
+
+	DEBUG("Extracting resource `%s' to staging directory", dentry->full_path_utf8);
+
 	old_lte = *lte;
 	fd = create_staging_file(&staging_file_name, O_WRONLY);
 	if (fd == -1)
@@ -238,9 +286,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
 		else
 			ret = -EIO;
 		close(fd);
-		unlink(staging_file_name);
-		FREE(staging_file_name);
-		return ret;
+		goto out_delete_staging_file;
 	}
 
 	link_group_size = dentry_link_group_size(dentry);
@@ -249,9 +295,13 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
 		if (link_group_size == old_lte->refcnt) {
 			/* This hard link group is the only user of the lookup
 			 * table entry, so we can re-use it. */
+			DEBUG("Re-using lookup table entry");
 			lookup_table_remove(w->lookup_table, old_lte);
 			new_lte = old_lte;
 		} else {
+			DEBUG("Splitting lookup table entry "
+			      "(link_group_size = %u, lte refcnt = %u)",
+			      link_group_size, old_lte->refcnt);
 			/* Split a hard link group away from the "lookup table
 			 * entry" hard link group (i.e. we had two hard link
 			 * groups that were identical, but now we are changing
@@ -266,8 +316,10 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
 			wimlib_assert(old_lte->refcnt > link_group_size);
 
 			new_lte = new_lookup_table_entry();
-			if (!new_lte)
-				return -ENOMEM;
+			if (!new_lte) {
+				ret = -ENOMEM;
+				goto out_delete_staging_file;
+			}
 
 			u16 num_transferred_fds = 0;
 			for (u16 i = 0; i < old_lte->num_allocated_fds; i++) {
@@ -278,14 +330,16 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
 					num_transferred_fds++;
 				}
 			}
+			DEBUG("Transferring %u file descriptors",
+			      num_transferred_fds);
 			new_lte->fds = MALLOC(num_transferred_fds *
 					      sizeof(new_lte->fds[0]));
 			if (!new_lte->fds) {
-				free_lookup_table_entry(new_lte);
-				return -ENOMEM;
+				FREE(new_lte);
+				ret = -ENOMEM;
+				goto out_delete_staging_file;
 			}
-			u16 j = 0;
-			for (u16 i = 0; i < old_lte->num_allocated_fds; i++) {
+			for (u16 i = 0, j = 0; ; i++) {
 				if (old_lte->fds[i] &&
 				    old_lte->fds[i]->dentry->hard_link ==
 				      dentry->hard_link)
@@ -295,13 +349,21 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
 					fd->lte = new_lte;
 					fd->idx = j;
 					new_lte->fds[j] = fd;
+					if (++j == num_transferred_fds)
+						break;
 				}
 			}
 			old_lte->refcnt -= link_group_size;
-			old_lte->num_opened_fds -= j;
-			new_lte->num_opened_fds = j;
-
+			old_lte->num_opened_fds -= num_transferred_fds;
+			new_lte->num_opened_fds = num_transferred_fds;
+			new_lte->num_allocated_fds = num_transferred_fds;
 		} 
+	} else {
+		new_lte = new_lookup_table_entry();
+		if (!new_lte) {
+			ret = -ENOMEM;
+			goto out_delete_staging_file;
+		}
 	}
 	new_lte->resource_entry.original_size = size;
 	new_lte->refcnt = link_group_size;
@@ -311,6 +373,10 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
 	lookup_table_insert(w->lookup_table, new_lte);
 	*lte = new_lte;
 	return 0;
+out_delete_staging_file:
+	unlink(staging_file_name);
+	FREE(staging_file_name);
+	return ret;
 }
 
 /* 
@@ -720,8 +786,7 @@ static int wimfs_fgetattr(const char *path, struct stat *stbuf,
 			  struct fuse_file_info *fi)
 {
 	struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
-	dentry_to_stbuf(fd->dentry, stbuf, w->lookup_table);
-	return 0;
+	return dentry_to_stbuf(fd->dentry, stbuf, w->lookup_table);
 }
 
 static int wimfs_ftruncate(const char *path, off_t size,
@@ -743,8 +808,7 @@ static int wimfs_getattr(const char *path, struct stat *stbuf)
 	struct dentry *dentry = get_dentry(w, path);
 	if (!dentry)
 		return -ENOENT;
-	dentry_to_stbuf(dentry, stbuf, w->lookup_table);
-	return 0;
+	return dentry_to_stbuf(dentry, stbuf, w->lookup_table);
 }
 
 /* Create a hard link */
@@ -777,6 +841,8 @@ static int wimfs_link(const char *to, const char *from)
 	}
 	list_add(&from_dentry->link_group_list, &to_dentry->link_group_list);
 	link_dentry(from_dentry, from_dentry_parent);
+	dentry_increment_lookup_table_refcnts(from_dentry, w->lookup_table);
+	from_dentry->link_group_master_status = GROUP_SLAVE;
 	return 0;
 }
 
@@ -836,11 +902,15 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 			return -ENOENT;
 		if (!dentry_is_directory(parent))
 			return -ENOTDIR;
+
 		basename = path_basename(path);
 		if (get_dentry_child_with_name(parent, path))
 			return -EEXIST;
 
 		dentry = new_dentry(basename);
+		if (!dentry)
+			return -ENOMEM;
+		dentry->hard_link = next_link_group_id++;
 		link_dentry(dentry, parent);
 	}
 	return 0;
@@ -872,10 +942,10 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 			return 0;
 		}
 
-		ret = extract_resource_to_staging_dir(dentry, &lte,
-						      lte->resource_entry.original_size);
+		ret = extract_resource_to_staging_dir(dentry, &lte, 0);
 		if (ret != 0)
 			return ret;
+		memcpy(dentry_hash, lte->hash, WIM_HASH_SIZE);
 	}
 
 	ret = alloc_wimlib_fd(lte, &fd);
@@ -896,6 +966,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 						      lte->resource_entry.original_size);
 		if (ret != 0)
 			return ret;
+		memcpy(dentry_hash, lte->hash, WIM_HASH_SIZE);
 	}
 	if (lte->staging_file_name) {
 		fd->staging_fd = open(lte->staging_file_name, fi->flags);
@@ -914,8 +985,11 @@ static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
 	struct dentry *dentry;
 	
 	dentry = get_dentry(w, path);
-	if (!dentry || !dentry_is_directory(dentry))
+	if (!dentry)
+		return -ENOENT;
+	if (!dentry_is_directory(dentry))
 		return -ENOTDIR;
+	dentry->num_times_opened++;
 	fi->fh = (uint64_t)dentry;
 	return 0;
 }
@@ -942,6 +1016,7 @@ static int wimfs_read(const char *path, char *buf, size_t size,
 		wimlib_assert(fd->staging_fd != -1);
 
 		ssize_t ret;
+		DEBUG("Seek to offset %zu", offset);
 
 		if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
 			return -errno;
@@ -1026,15 +1101,38 @@ static int wimfs_release(const char *path, struct fuse_file_info *fi)
 		wimlib_assert(!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE));
 		return 0;
 	}
+
+	if (flags_writable(fi->flags) && fd->dentry) {
+		u64 now = get_timestamp();
+		fd->dentry->last_access_time = now;
+		fd->dentry->last_write_time = now;
+	}
+
 	return close_wimlib_fd(fd);
 }
 
+static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
+{
+	struct dentry *dentry = (struct dentry *)fi->fh;
+
+	wimlib_assert(dentry->num_times_opened);
+	if (--dentry->num_times_opened == 0)
+		free_dentry(dentry);
+	return 0;
+}
+
 /* Renames a file or directory.  See rename (3) */
 static int wimfs_rename(const char *from, const char *to)
 {
 	struct dentry *src;
 	struct dentry *dst;
 	struct dentry *parent_of_dst;
+	char *file_name_utf16 = NULL, *file_name_utf8 = NULL;
+	u16 file_name_utf16_len, file_name_utf8_len;
+	int ret;
+
+	/* This rename() implementation currently only supports actual files
+	 * (not alternate data streams) */
 	
 	src = get_dentry(w, from);
 	if (!src)
@@ -1042,7 +1140,17 @@ static int wimfs_rename(const char *from, const char *to)
 
 	dst = get_dentry(w, to);
 
+
+	ret = get_names(&file_name_utf16, &file_name_utf8,
+			&file_name_utf16_len, &file_name_utf8_len,
+			path_basename(to));
+	if (ret != 0)
+		return -ENOMEM;
+
 	if (dst) {
+		if (src == dst) /* Same file */
+			return 0;
+
 		if (!dentry_is_directory(src)) {
 			/* Cannot rename non-directory to directory. */
 			if (dentry_is_directory(dst))
@@ -1056,19 +1164,22 @@ static int wimfs_rename(const char *from, const char *to)
 				return -ENOTEMPTY;
 		}
 		parent_of_dst = dst->parent;
-		unlink_dentry(dst);
-		lookup_table_decrement_refcnt(w->lookup_table, dst->hash);
-		free_dentry(dst);
+		remove_dentry(dst, w->lookup_table);
 	} else {
 		parent_of_dst = get_parent_dentry(w, to);
 		if (!parent_of_dst)
 			return -ENOENT;
 	}
 
+	FREE(src->file_name);
+	FREE(src->file_name_utf8);
+	src->file_name          = file_name_utf16;
+	src->file_name_utf8     = file_name_utf8;
+	src->file_name_len      = file_name_utf16_len;
+	src->file_name_utf8_len = file_name_utf8_len;
+
 	unlink_dentry(src);
-	change_dentry_name(src, path_basename(to));
 	link_dentry(src, parent_of_dst);
-	/*calculate_dentry_full_path(src);*/
 	return 0;
 }
 
@@ -1085,7 +1196,8 @@ static int wimfs_rmdir(const char *path)
 		return -ENOTEMPTY;
 
 	unlink_dentry(dentry);
-	free_dentry(dentry);
+	if (dentry->num_times_opened == 0)
+		free_dentry(dentry);
 	return 0;
 }
 
@@ -1167,25 +1279,10 @@ static int wimfs_unlink(const char *path)
 	if (ret != 0)
 		return ret;
 
-	if (lte && lte->staging_file_name)
-		if (unlink(lte->staging_file_name) != 0)
-			return -errno;
-
 	if (dentry_hash == dentry->hash) {
 		/* We are removing the full dentry including all alternate data
 		 * streams. */
-		const u8 *hash = dentry->hash;
-		u16 i = 0;
-		while (1) {
-			lookup_table_decrement_refcnt(w->lookup_table, hash);
-			if (i == dentry->num_ads)
-				break;
-			hash = dentry->ads_entries[i].hash;
-			i++;
-		}
-
-		unlink_dentry(dentry);
-		free_dentry(dentry);
+		remove_dentry(dentry, w->lookup_table);
 	} else {
 		/* We are removing an alternate data stream. */
 		struct ads_entry *cur_entry = dentry->ads_entries;
@@ -1231,41 +1328,42 @@ static int wimfs_write(const char *path, const char *buf, size_t size,
 	wimlib_assert(fd->lte->staging_file_name);
 	wimlib_assert(fd->staging_fd != -1);
 
+	/* Seek to the requested position */
+	if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
+		return -errno;
+
 	/* Write the data. */
 	ret = write(fd->staging_fd, buf, size);
 	if (ret == -1)
 		return -errno;
 
-	/* The file has been modified, so all its timestamps must be
-	 * updated. */
-	dentry_update_all_timestamps(fd->dentry);
-
 	return ret;
 }
 
 
 static struct fuse_operations wimfs_operations = {
-	.access    = wimfs_access,
-	.destroy   = wimfs_destroy,
-	.fgetattr  = wimfs_fgetattr,
-	.ftruncate = wimfs_ftruncate,
-	.getattr   = wimfs_getattr,
-	.link      = wimfs_link,
-	.mkdir     = wimfs_mkdir,
-	.mknod     = wimfs_mknod,
-	.open      = wimfs_open,
-	.opendir   = wimfs_opendir,
-	.read      = wimfs_read,
-	.readdir   = wimfs_readdir,
-	.readlink  = wimfs_readlink,
-	.release   = wimfs_release,
-	.rename    = wimfs_rename,
-	.rmdir     = wimfs_rmdir,
-	.symlink   = wimfs_symlink,
-	.truncate  = wimfs_truncate,
-	.unlink    = wimfs_unlink,
-	.utimens   = wimfs_utimens,
-	.write     = wimfs_write,
+	.access     = wimfs_access,
+	.destroy    = wimfs_destroy,
+	.fgetattr   = wimfs_fgetattr,
+	.ftruncate  = wimfs_ftruncate,
+	.getattr    = wimfs_getattr,
+	.link       = wimfs_link,
+	.mkdir      = wimfs_mkdir,
+	.mknod      = wimfs_mknod,
+	.open       = wimfs_open,
+	.opendir    = wimfs_opendir,
+	.read       = wimfs_read,
+	.readdir    = wimfs_readdir,
+	.readlink   = wimfs_readlink,
+	.release    = wimfs_release,
+	.releasedir = wimfs_releasedir,
+	.rename     = wimfs_rename,
+	.rmdir      = wimfs_rmdir,
+	.symlink    = wimfs_symlink,
+	.truncate   = wimfs_truncate,
+	.unlink     = wimfs_unlink,
+	.utimens    = wimfs_utimens,
+	.write      = wimfs_write,
 };
 
 
@@ -1274,7 +1372,7 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
 			   int flags)
 {
 	int argc = 0;
-	char *argv[6];
+	char *argv[16];
 	int ret;
 	char *p;
 
@@ -1289,6 +1387,10 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
 	if (ret != 0)
 		return ret;
 
+	DEBUG("Selected image %d", image);
+
+	next_link_group_id = assign_link_groups(wim->image_metadata[image - 1].lgt);
+
 	if (flags & WIMLIB_MOUNT_FLAG_READWRITE)
 		wim_get_current_image_metadata(wim)->modified = true;
 
@@ -1315,16 +1417,19 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
 	if (flags & WIMLIB_MOUNT_FLAG_DEBUG) {
 		argv[argc++] = "-d";
 	}
-	if (!(flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
-		argv[argc++] = "-o";
-		argv[argc++] = "ro";
-	} else {
+	char optstring[256] = "use_ino";
+	argv[argc++] = "-o";
+	argv[argc++] = optstring;
+	if ((flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
 		make_staging_dir();
 		if (!staging_dir_name) {
 			FREE(p);
 			return WIMLIB_ERR_MKDIR;
 		}
+	} else {
+		strcat(optstring, ",ro");
 	}
+	argv[argc] = NULL;
 
 #ifdef ENABLE_DEBUG
 	{