* 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/.
*/
#include "wimlib_internal.h"
#ifdef WITH_FUSE
+
#include "sha1.h"
#include "lookup_table.h"
#include "xml.h"
#include <fuse.h>
#include <ftw.h>
#include <mqueue.h>
+#include <utime.h>
+
+#ifdef ENABLE_XATTR
+#include <attr/xattr.h>
+#endif
+/* File descriptor to a file open on the WIM filesystem. */
struct wimlib_fd {
- u16 idx;
- int staging_fd;
- u64 hard_link_group;
+ struct inode *f_inode;
struct lookup_table_entry *lte;
- struct dentry *dentry;
+ int staging_fd;
+ u16 idx;
+ u32 stream_id;
};
/* The WIMStruct for the mounted WIM. */
/* Name of the directory on which the WIM file is mounted. */
static const char *mount_dir;
+/* Next inode number to be assigned. */
+static u64 next_ino;
+
+/* List of lookup table entries in the staging directory */
+static LIST_HEAD(staging_list);
static inline int get_lookup_flags()
{
return 0;
}
+/* Returns nonzero if write permission is requested on the file open flags */
static inline int flags_writable(int open_flags)
{
return open_flags & (O_RDWR | O_WRONLY);
}
-static int alloc_wimlib_fd(struct lookup_table_entry *lte,
+/*
+ * Allocate a file descriptor for a stream.
+ *
+ * @inode: inode containing the stream we're opening
+ * @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.
+ *
+ * Return 0 iff successful or error code if unsuccessful.
+ */
+static int alloc_wimlib_fd(struct inode *inode,
+ u32 stream_id,
+ struct lookup_table_entry *lte,
struct wimlib_fd **fd_ret)
{
static const u16 fds_per_alloc = 8;
static const u16 max_fds = 0xffff;
- if (lte->num_opened_fds == lte->num_allocated_fds) {
+ DEBUG("Allocating fd for stream ID %u from inode %lx (open = %u, allocated = %u)",
+ stream_id, inode->ino, inode->num_opened_fds,
+ inode->num_allocated_fds);
+
+ if (inode->num_opened_fds == inode->num_allocated_fds) {
struct wimlib_fd **fds;
u16 num_new_fds;
- if (lte->num_allocated_fds == max_fds)
+ if (inode->num_allocated_fds == max_fds)
return -EMFILE;
- num_new_fds = min(fds_per_alloc, max_fds - lte->num_allocated_fds);
+ num_new_fds = min(fds_per_alloc,
+ max_fds - inode->num_allocated_fds);
- fds = CALLOC(lte->num_allocated_fds + num_new_fds,
- sizeof(lte->fds[0]));
+ fds = REALLOC(inode->fds,
+ (inode->num_allocated_fds + num_new_fds) *
+ sizeof(inode->fds[0]));
if (!fds)
return -ENOMEM;
- memcpy(fds, lte->fds,
- lte->num_allocated_fds * sizeof(lte->fds[0]));
- FREE(lte->fds);
- lte->fds = fds;
- lte->num_allocated_fds += num_new_fds;
+ memset(&fds[inode->num_allocated_fds], 0,
+ num_new_fds * sizeof(fds[0]));
+ inode->fds = fds;
+ inode->num_allocated_fds += num_new_fds;
}
for (u16 i = 0; ; i++) {
- if (!lte->fds[i]) {
+ if (!inode->fds[i]) {
struct wimlib_fd *fd = CALLOC(1, sizeof(*fd));
if (!fd)
return -ENOMEM;
+ fd->f_inode = inode;
+ fd->lte = lte;
fd->staging_fd = -1;
fd->idx = i;
- fd->lte = lte;
- lte->fds[i] = fd;
- lte->num_opened_fds++;
+ fd->stream_id = stream_id;
*fd_ret = fd;
+ inode->fds[i] = fd;
+ inode->num_opened_fds++;
+ if (lte)
+ lte->num_opened_fds++;
+ DEBUG("Allocated fd");
return 0;
}
}
}
-static int close_wimlib_fd(struct wimlib_fd *fd)
+static void inode_put_fd(struct inode *inode, struct wimlib_fd *fd)
{
- struct lookup_table_entry *lte = fd->lte;
+ wimlib_assert(fd);
+ wimlib_assert(inode);
+ wimlib_assert(fd->f_inode == inode);
+ wimlib_assert(inode->num_opened_fds);
+ wimlib_assert(fd->idx < inode->num_opened_fds);
+ wimlib_assert(inode->fds[fd->idx] == fd);
+
+ inode->fds[fd->idx] = NULL;
+ FREE(fd);
+ if (--inode->num_opened_fds == 0 && inode->link_count == 0)
+ free_inode(inode);
+}
+
+static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd)
+{
+ wimlib_assert(fd);
+ wimlib_assert(fd->lte == lte);
+
+ if (!lte) /* Empty stream with no lookup table entry */
+ return 0;
- wimlib_assert(lte);
+ /* Close staging file descriptor if needed. */
wimlib_assert(lte->num_opened_fds);
- if (lte->staging_file_name) {
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ wimlib_assert(lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
- if (close(fd->staging_fd) != 0)
+ if (close(fd->staging_fd) != 0) {
+ ERROR_WITH_ERRNO("Failed to close staging file");
return -errno;
+ }
}
- if (--lte->num_opened_fds == 0 && lte->refcnt == 0)
- free_lookup_table_entry(lte);
- lte->fds[fd->idx] = NULL;
- FREE(fd);
+ lte_decrement_num_opened_fds(lte, w->lookup_table);
+ return 0;
+}
+
+/* Close a file descriptor. */
+static int close_wimlib_fd(struct wimlib_fd *fd)
+{
+ int ret;
+ wimlib_assert(fd);
+ DEBUG("Closing fd (inode = %lu, opened = %u, allocated = %u)",
+ fd->f_inode->ino, fd->f_inode->num_opened_fds,
+ fd->f_inode->num_allocated_fds);
+ ret = lte_put_fd(fd->lte, fd);
+ if (ret != 0)
+ return ret;
+
+ inode_put_fd(fd->f_inode, fd);
return 0;
}
+/* Remove a dentry; i.e. remove a reference to the corresponding inode.
+ *
+ * If there are no remaining references to the inode either through dentries or
+ * open file descriptors, the inode is freed. Otherwise, the inode is not
+ * removed, but the dentry is unlinked and freed.
+ *
+ * Either way, all lookup table entries referenced by the inode have their
+ * reference count decremented. If a lookup table entry has no open file
+ * descriptors and no references remaining, it is freed, and the staging file is
+ * unlinked.
+ */
+static void remove_dentry(struct dentry *dentry,
+ struct lookup_table *lookup_table)
+{
+ struct inode *inode = dentry->d_inode;
+ struct lookup_table_entry *lte;
+ unsigned i;
+
+ for (i = 0; i <= inode->num_ads; i++) {
+ lte = inode_stream_lte_resolved(inode, i);
+ if (lte)
+ lte_decrement_refcnt(lte, lookup_table);
+ }
+ unlink_dentry(dentry);
+ put_dentry(dentry);
+}
+
/* Creates a new staging file and returns its file descriptor opened for
* writing.
*
int fd;
int errno_save;
- name_len = staging_dir_name_len + 1 + WIM_HASH_SIZE;
+ name_len = staging_dir_name_len + 1 + SHA1_HASH_SIZE;
name = MALLOC(name_len + 1);
if (!name) {
errno = ENOMEM;
memcpy(name, staging_dir_name, staging_dir_name_len);
name[staging_dir_name_len] = '/';
randomize_char_array_with_alnum(name + staging_dir_name_len + 1,
- WIM_HASH_SIZE);
+ SHA1_HASH_SIZE);
name[name_len] = '\0';
/*
* Extract a WIM resource to the staging directory.
*
- * We need to:
- * - Create a staging file for the WIM resource
- * - Extract the resource to it
- * - Create a new lte for the file resource
- * - Transfer fds from the old lte to the new lte, but
- * only if they share the same hard link group as this
- * dentry
+ * @inode: Inode that contains the stream we are extracting
+ *
+ * @stream_id: Identifier for the stream (it stays constant even if the indices
+ * of the stream entries are changed)
+ *
+ * @lte: Pointer to pointer to the lookup table entry for the stream we need to
+ * extract, or NULL if there was no lookup table entry present for the stream
+ *
+ * @size: Number of bytes of the stream we want to extract (this supports the
+ * wimfs_truncate() function).
*/
-static int extract_resource_to_staging_dir(struct dentry *dentry,
+static int extract_resource_to_staging_dir(struct inode *inode,
+ u32 stream_id,
struct lookup_table_entry **lte,
off_t size)
{
int ret;
int fd;
struct lookup_table_entry *old_lte, *new_lte;
- size_t link_group_size;
-
+
old_lte = *lte;
fd = create_staging_file(&staging_file_name, O_WRONLY);
if (fd == -1)
return -errno;
if (old_lte)
- ret = extract_resource_to_fd(w, &old_lte->resource_entry, fd,
- size);
+ ret = extract_wim_resource_to_fd(old_lte, fd, size);
else
ret = 0;
if (ret != 0 || close(fd) != 0) {
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);
+ if (old_lte && inode->link_count == old_lte->refcnt) {
+ /* The reference count of the existing lookup table
+ * entry is the same as the link count of the inode that
+ * contains the stream we're opening. Therefore, ALL
+ * the references to the lookup table entry correspond
+ * to the stream we're trying to extract, so the lookup
+ * table entry can be re-used. */
+ DEBUG("Re-using lookup table entry");
+ lookup_table_unlink(w->lookup_table, old_lte);
+ new_lte = old_lte;
+ } else {
+ if (old_lte) {
+ /* There's an existing lookup table entry, but its
+ * reference count is creater than the link count for
+ * the inode containing a stream we're opening.
+ * Therefore, we need to split the lookup table entry.
+ * */
+ wimlib_assert(old_lte->refcnt > inode->link_count);
+ DEBUG("Splitting lookup table entry "
+ "(inode->link_count = %zu, old_lte->refcnt = %u)",
+ inode->link_count, old_lte->refcnt);
- if (old_lte) {
- 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. */
- lookup_table_remove(w->lookup_table, old_lte);
- new_lte = old_lte;
- } else {
- /* 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
- * one of them) */
-
- /* XXX The ADS really complicate things here and not
- * everything is going to work correctly yet. For
- * example it could be the same that a file contains two
- * file streams that are identical and therefore share
- * the same lookup table entry despite the fact that the
- * streams themselves are not hardlinked. */
- wimlib_assert(old_lte->refcnt > link_group_size);
-
- new_lte = new_lookup_table_entry();
- if (!new_lte)
- return -ENOMEM;
+ }
- u16 num_transferred_fds = 0;
- for (u16 i = 0; i < old_lte->num_allocated_fds; i++) {
- if (old_lte->fds[i] &&
- old_lte->fds[i]->dentry->hard_link ==
- dentry->hard_link)
- {
- 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;
- }
- u16 j = 0;
- for (u16 i = 0; i < old_lte->num_allocated_fds; i++) {
- if (old_lte->fds[i] &&
- old_lte->fds[i]->dentry->hard_link ==
- dentry->hard_link)
- {
- struct wimlib_fd *fd = old_lte->fds[i];
- old_lte->fds[i] = NULL;
+ new_lte = new_lookup_table_entry();
+ if (!new_lte) {
+ ret = -ENOMEM;
+ goto out_delete_staging_file;
+ }
+
+ /* There may already be open file descriptors to this stream if
+ * it's previously been opened read-only, but just now we're
+ * opening it read-write. Identify those file descriptors and
+ * change their lookup table entry pointers to point to the new
+ * lookup table entry, and open staging file descriptors for
+ * them.
+ *
+ * At the same time, we need to count the number of these opened
+ * file descriptors to the new lookup table entry. If there's
+ * an old lookup table entry, this number needs to be subtracted
+ * from the fd's opened to the old entry. */
+ for (u16 i = 0, j = 0; j < inode->num_opened_fds; i++) {
+ struct wimlib_fd *fd = inode->fds[i];
+ if (fd) {
+ if (fd->stream_id == stream_id) {
+ wimlib_assert(fd->lte == old_lte);
fd->lte = new_lte;
- fd->idx = j;
- new_lte->fds[j] = fd;
+ new_lte->num_opened_fds++;
+ fd->staging_fd = open(staging_file_name, O_RDONLY);
+ if (fd->staging_fd == -1) {
+ ret = -errno;
+ goto out_revert_fd_changes;
+ }
}
+ j++;
}
- old_lte->refcnt -= link_group_size;
- old_lte->num_opened_fds -= j;
- new_lte->num_opened_fds = j;
-
- }
+ }
+ DEBUG("%zu fd's were already opened to the file we extracted",
+ new_lte->num_opened_fds);
+ if (old_lte) {
+ old_lte->num_opened_fds -= new_lte->num_opened_fds;
+ old_lte->refcnt -= inode->link_count;
+ }
}
+
new_lte->resource_entry.original_size = size;
- new_lte->refcnt = link_group_size;
- randomize_byte_array(new_lte->hash, WIM_HASH_SIZE);
- new_lte->staging_file_name = staging_file_name;
+ new_lte->refcnt = inode->link_count;
+ new_lte->staging_file_name = staging_file_name;
+ new_lte->resource_location = RESOURCE_IN_STAGING_FILE;
+ new_lte->lte_inode = inode;
+ random_hash(new_lte->hash);
+
+ if (stream_id == 0)
+ inode->lte = new_lte;
+ else
+ for (u16 i = 0; i < inode->num_ads; i++)
+ if (inode->ads_entries[i].stream_id == stream_id)
+ inode->ads_entries[i].lte = new_lte;
lookup_table_insert(w->lookup_table, new_lte);
+ list_add(&new_lte->staging_list, &staging_list);
*lte = new_lte;
return 0;
+out_revert_fd_changes:
+ for (u16 i = 0, j = 0; j < new_lte->num_opened_fds; i++) {
+ struct wimlib_fd *fd = inode->fds[i];
+ if (fd && fd->stream_id == stream_id && fd->lte == new_lte) {
+ fd->lte = old_lte;
+ if (fd->staging_fd != -1) {
+ close(fd->staging_fd);
+ fd->staging_fd = -1;
+ }
+ j++;
+ }
+ }
+out_free_new_lte:
+ free_lookup_table_entry(new_lte);
+out_delete_staging_file:
+ unlink(staging_file_name);
+ FREE(staging_file_name);
+ return ret;
}
/*
}
static int remove_file_or_directory(const char *fpath, const struct stat *sb,
- int typeflag, struct FTW *ftwbuf)
+ int typeflag, struct FTW *ftwbuf)
{
if (remove(fpath) == 0)
return 0;
/*
* Deletes the staging directory and all the files contained in it.
*/
-static inline int delete_staging_dir()
+static int delete_staging_dir()
{
int ret;
* commands */
static char *unmount_to_daemon_mq_name;
static char *daemon_to_unmount_mq_name;
-static int unmount_to_daemon_mq;
-static int daemon_to_unmount_mq;
+static mqd_t unmount_to_daemon_mq;
+static mqd_t daemon_to_unmount_mq;
/* Simple function that returns the concatenation of 4 strings. */
static char *strcat_dup(const char *s1, const char *s2, const char *s3,
- const char *s4)
+ const char *s4)
{
size_t len = strlen(s1) + strlen(s2) + strlen(s3) + strlen(s4) + 1;
char *p = MALLOC(len);
if (!p)
return NULL;
- *p = '\0';
- strcat(p, s1);
- strcat(p, s2);
- strcat(p, s3);
- strcat(p, s4);
- return p;
+ p = strcpy(p, s1);
+ p = strcat(p, s2);
+ p = strcat(p, s3);
+ return strcat(p, s4);
}
/* Removes trailing forward slashes in a string. */
unmount_to_daemon_mq = mq_open(unmount_to_daemon_mq_name, flags,
0700, NULL);
- if (unmount_to_daemon_mq == -1) {
+ if (unmount_to_daemon_mq == (mqd_t)-1) {
ERROR_WITH_ERRNO("mq_open()");
ret = WIMLIB_ERR_MQUEUE;
goto err2;
daemon_to_unmount_mq = mq_open(daemon_to_unmount_mq_name, flags,
0700, NULL);
- if (daemon_to_unmount_mq == -1) {
+ if (daemon_to_unmount_mq == (mqd_t)-1) {
ERROR_WITH_ERRNO("mq_open()");
ret = WIMLIB_ERR_MQUEUE;
goto err3;
static int wimfs_access(const char *path, int mask)
{
- /* XXX Permissions not implemented */
+ /* Permissions not implemented */
return 0;
}
-/* Closes the staging file descriptor associated with the lookup table entry, if
- * it is opened. */
-static int close_lte_fds(struct lookup_table_entry *lte, void *ignore)
+static int update_lte_of_staging_file(struct lookup_table_entry *lte,
+ struct lookup_table *table)
{
- for (u16 i = 0; i < lte->num_opened_fds; i++) {
- if (lte->fds[i] && lte->fds[i]->staging_fd != -1) {
- if (close(lte->fds[i]->staging_fd) != 0) {
- ERROR_WITH_ERRNO("Failed close file `%s'",
- lte->staging_file_name);
- return WIMLIB_ERR_WRITE;
- }
+ struct lookup_table_entry *duplicate_lte;
+ int ret;
+ u8 hash[SHA1_HASH_SIZE];
+ struct stat stbuf;
+
+ wimlib_assert(lte->resource_location == RESOURCE_IN_STAGING_FILE);
+ wimlib_assert(lte->staging_file_name);
+
+ ret = sha1sum(lte->staging_file_name, hash);
+ if (ret != 0)
+ return ret;
+
+ lookup_table_unlink(table, lte);
+
+ duplicate_lte = __lookup_resource(table, hash);
+
+ if (duplicate_lte) {
+ /* Merge duplicate lookup table entries */
+ duplicate_lte->refcnt += lte->refcnt;
+ list_del(<e->staging_list);
+ free_lookup_table_entry(lte);
+ } else {
+ if (stat(lte->staging_file_name, &stbuf) != 0) {
+ ERROR_WITH_ERRNO("Failed to stat `%s'", lte->staging_file_name);
+ return WIMLIB_ERR_STAT;
}
+ wimlib_assert(<e->file_on_disk == <e->staging_file_name);
+ lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
+ copy_hash(lte->hash, hash);
+ lte->resource_entry.original_size = stbuf.st_size;
+ lte->resource_entry.size = stbuf.st_size;
+ lte->lte_inode = NULL;
+ lookup_table_insert(table, lte);
}
+
return 0;
}
-
-/* Calculates the SHA1 sum for @dentry if its file resource is in a staging
- * file. Updates the SHA1 sum in the dentry and the lookup table entry. If
- * there is already a lookup table entry with the same checksum, increment its
- * reference count and destroy the lookup entry with the updated checksum. */
-static int calculate_sha1sum_for_staging_file(struct dentry *dentry,
- void *_lookup_table)
+static int inode_close_fds(struct inode *inode)
{
- struct lookup_table *lookup_table = _lookup_table;
- u8 *hash = dentry->hash;
- u16 i = 0;
- while (1) {
- struct lookup_table_entry *lte = __lookup_resource(lookup_table, hash);
- if (lte && lte->staging_file_name) {
- struct lookup_table_entry *existing;
- int ret;
-
- DEBUG("Calculating SHA1 hash for file `%s'",
- dentry->file_name_utf8);
- ret = sha1sum(lte->staging_file_name, lte->hash);
+ for (u16 i = 0, j = 0; j < inode->num_opened_fds; i++) {
+ struct wimlib_fd *fd = inode->fds[i];
+ if (fd) {
+ wimlib_assert(fd->f_inode == inode);
+ int ret = close_wimlib_fd(fd);
if (ret != 0)
return ret;
-
- lookup_table_unlink(lookup_table, lte);
- memcpy(hash, lte->hash, WIM_HASH_SIZE);
- existing = __lookup_resource(lookup_table, hash);
- if (existing) {
- DEBUG("Merging duplicate lookup table entries for file "
- "`%s'", dentry->file_name_utf8);
- free_lookup_table_entry(lte);
- existing->refcnt++;
- } else {
- lookup_table_insert(lookup_table, lte);
- }
+ j++;
}
- if (i == dentry->num_ads)
- break;
- hash = dentry->ads_entries[i].hash;
- i++;
}
return 0;
}
+/*static int dentry_close_fds(struct dentry *dentry, void *ignore)*/
+/*{*/
+ /*return inode_close_fds(dentry->d_inode);*/
+/*}*/
+
/* Overwrites the WIM file, with changes saved. */
static int rebuild_wim(WIMStruct *w, bool check_integrity)
{
int ret;
- struct dentry *root;
+ struct lookup_table_entry *lte, *tmp;
- root = wim_root_dentry(w);
DEBUG("Closing all staging file descriptors.");
- /* Close all the staging file descriptors. */
- ret = for_lookup_table_entry(w->lookup_table, close_lte_fds, NULL);
- if (ret != 0) {
- ERROR("Failed to close all staging files");
- return ret;
+ list_for_each_entry(lte, &staging_list, staging_list) {
+ ret = inode_close_fds(lte->lte_inode);
+ if (ret != 0)
+ return ret;
}
+ /*ret = for_dentry_in_tree(wim_root_dentry(w), dentry_close_fds, NULL);*/
+ /*if (ret != 0)*/
+ /*return ret;*/
DEBUG("Calculating SHA1 checksums for all new staging files.");
- /* Calculate SHA1 checksums for all staging files, and merge unnecessary
- * lookup table entries. */
- ret = for_dentry_in_tree(root, calculate_sha1sum_for_staging_file,
- w->lookup_table);
- if (ret != 0) {
- ERROR("Failed to calculate new SHA1 checksums");
- return ret;
+ list_for_each_entry_safe(lte, tmp, &staging_list, staging_list) {
+ ret = update_lte_of_staging_file(lte, w->lookup_table);
+ if (ret != 0)
+ return ret;
}
xml_update_image_info(w, w->current_image);
/* Called when the filesystem is unmounted. */
static void wimfs_destroy(void *p)
{
-
/* For read-write mounts, the `imagex unmount' command, which is
* running in a separate process and is executing the
* wimlib_unmount() function, will send this process a byte
if (status == 0)
status = ret;
}
+ } else {
+ DEBUG("Read-only mount");
}
done:
+ DEBUG("Sending status %u", status);
ret = mq_send(daemon_to_unmount_mq, &status, 1, 1);
if (ret == -1)
ERROR_WITH_ERRNO("Failed to send status to unmount process");
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*)(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)
{
- struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
- dentry_to_stbuf(fd->dentry, stbuf, w->lookup_table);
- return 0;
+ struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
+ return inode_to_stbuf(fd->f_inode, fd->lte, stbuf);
}
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;
- fd->lte->resource_entry.original_size = size;
+ if (fd->lte && size < fd->lte->resource_entry.original_size)
+ fd->lte->resource_entry.original_size = size;
return 0;
}
*/
static int wimfs_getattr(const char *path, struct stat *stbuf)
{
- struct dentry *dentry = get_dentry(w, path);
+ struct dentry *dentry;
+ struct lookup_table_entry *lte;
+ int ret;
+
+ ret = lookup_resource(w, path,
+ get_lookup_flags() | LOOKUP_FLAG_DIRECTORY_OK,
+ &dentry, <e, NULL);
+ if (ret != 0)
+ return ret;
+ return inode_to_stbuf(dentry->d_inode, lte, 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)
+{
+ int ret;
+ struct dentry *dentry;
+ struct ads_entry *ads_entry;
+ size_t res_size;
+ struct lookup_table_entry *lte;
+
+ if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
+ return -ENOTSUP;
+
+ if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+ return -ENOATTR;
+ name += 5;
+
+ dentry = get_dentry(w, path);
if (!dentry)
return -ENOENT;
- dentry_to_stbuf(dentry, stbuf, w->lookup_table);
- return 0;
+ ads_entry = inode_get_ads_entry(dentry->d_inode, name, NULL);
+ if (!ads_entry)
+ return -ENOATTR;
+
+ lte = ads_entry->lte;
+ res_size = wim_resource_size(lte);
+
+ if (size == 0)
+ return res_size;
+ if (res_size > size)
+ return -ERANGE;
+ ret = read_full_wim_resource(lte, (u8*)value);
+ if (ret != 0)
+ return -EIO;
+ return res_size;
}
+#endif
/* Create a hard link */
static int wimfs_link(const char *to, const char *from)
{
- struct dentry *to_dentry, *from_dentry, *from_dentry_parent;
+ struct dentry *from_dentry, *from_dentry_parent;
const char *link_name;
+ struct inode *inode;
+ struct lookup_table_entry *lte;
- to_dentry = get_dentry(w, to);
- if (!to_dentry)
+ inode = wim_pathname_to_inode(w, to);
+ if (!inode)
return -ENOENT;
- if (!dentry_is_regular_file(to_dentry))
+
+ if (!inode_is_regular_file(inode))
return -EPERM;
from_dentry_parent = get_parent_dentry(w, from);
link_name = path_basename(from);
if (get_dentry_child_with_name(from_dentry_parent, link_name))
return -EEXIST;
- from_dentry = clone_dentry(to_dentry);
+ from_dentry = new_dentry(link_name);
if (!from_dentry)
return -ENOMEM;
- if (change_dentry_name(from_dentry, link_name) != 0) {
- FREE(from_dentry);
- return -ENOMEM;
- }
- if (calculate_dentry_full_path(from_dentry, to_dentry) != 0) {
- FREE(from_dentry->file_name);
- FREE(from_dentry->file_name_utf8);
- FREE(from_dentry);
- return -ENOMEM;
+
+
+ inode_add_dentry(from_dentry, inode);
+ from_dentry->d_inode = inode;
+ inode->link_count++;
+
+ for (unsigned i = 0; i <= inode->num_ads; i++) {
+ lte = inode_stream_lte_resolved(inode, i);
+ if (lte)
+ lte->refcnt++;
}
- list_add(&from_dentry->link_group_list, &to_dentry->link_group_list);
+
link_dentry(from_dentry, from_dentry_parent);
return 0;
}
+#ifdef ENABLE_XATTR
+static int wimfs_listxattr(const char *path, char *list, size_t size)
+{
+ struct dentry *dentry;
+ int ret;
+ char *p = list;
+ size_t needed_size;
+ unsigned i;
+ struct inode *inode;
+ if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
+ return -ENOTSUP;
+
+ /* List alternate data streams, or get the list size */
+
+ ret = lookup_resource(w, path, get_lookup_flags(), &dentry, NULL, NULL);
+ if (ret != 0)
+ return ret;
+ inode = dentry->d_inode;
+
+ if (size == 0) {
+ needed_size = 0;
+ for (i = 0; i < inode->num_ads; i++)
+ needed_size += inode->ads_entries[i].stream_name_utf8_len + 6;
+ return needed_size;
+ } else {
+ for (i = 0; i < inode->num_ads; i++) {
+ needed_size = inode->ads_entries[i].stream_name_utf8_len + 6;
+ if (needed_size > size)
+ return -ERANGE;
+ p += sprintf(p, "user.%s",
+ inode->ads_entries[i].stream_name_utf8) + 1;
+ size -= needed_size;
+ }
+ return p - list;
+ }
+}
+#endif
+
/*
* Create a directory in the WIM.
* @mode is currently ignored.
if (get_dentry_child_with_name(parent, basename))
return -EEXIST;
- newdir = new_dentry(basename);
- newdir->attributes |= FILE_ATTRIBUTE_DIRECTORY;
+ newdir = new_dentry_with_inode(basename);
+ newdir->d_inode->attributes |= FILE_ATTRIBUTE_DIRECTORY;
+ newdir->d_inode->resolved = true;
+ newdir->d_inode->ino = next_ino++;
link_dentry(newdir, parent);
return 0;
}
const char *stream_name;
if ((mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
&& (stream_name = path_stream_name(path))) {
+ /* Make an alternate data stream */
struct ads_entry *new_entry;
struct dentry *dentry;
+ char *p = (char*)stream_name - 1;
+ wimlib_assert(*p == ':');
+ *p = '\0';
+
dentry = get_dentry(w, path);
if (!dentry || !dentry_is_regular_file(dentry))
return -ENOENT;
- if (dentry_get_ads_entry(dentry, stream_name))
+ if (inode_get_ads_entry(dentry->d_inode, stream_name, NULL))
return -EEXIST;
- new_entry = dentry_add_ads(dentry, stream_name);
+ new_entry = inode_add_ads(dentry->d_inode, stream_name);
if (!new_entry)
return -ENOENT;
} else {
struct dentry *dentry, *parent;
const char *basename;
+ /* Make a normal file (not an alternate data stream) */
+
/* Make sure that the parent of @path exists and is a directory, and
* that the dentry named by @path does not already exist. */
parent = get_parent_dentry(w, path);
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);
+ dentry = new_dentry_with_inode(basename);
+ if (!dentry)
+ return -ENOMEM;
+ dentry->d_inode->resolved = true;
+ dentry->d_inode->ino = next_ino++;
link_dentry(dentry, parent);
}
return 0;
{
struct dentry *dentry;
struct lookup_table_entry *lte;
- u8 *dentry_hash;
int ret;
struct wimlib_fd *fd;
+ struct inode *inode;
+ u16 stream_idx;
+ u32 stream_id;
ret = lookup_resource(w, path, get_lookup_flags(), &dentry, <e,
- &dentry_hash);
+ &stream_idx);
if (ret != 0)
return ret;
- if (!lte) {
- /* Empty file with no lookup-table entry. This is fine if it's
- * a read-only filesystem. Otherwise we need to create a lookup
- * table entry so that we can keep track of the file descriptors
- * (this is important in case someone opens the file for
- * writing) */
- if (!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
- fi->fh = 0;
- return 0;
- }
+ inode = dentry->d_inode;
- ret = extract_resource_to_staging_dir(dentry, <e,
- lte->resource_entry.original_size);
+ if (stream_idx == 0)
+ stream_id = 0;
+ else
+ stream_id = inode->ads_entries[stream_idx - 1].stream_id;
+
+ /* The file resource may be in the staging directory (read-write mounts
+ * only) or in the WIM. If it's in the staging directory, we need to
+ * open a native file descriptor for the corresponding file. Otherwise,
+ * we can read the file resource directly from the WIM file if we are
+ * opening it read-only, but we need to extract the resource to the
+ * staging directory if we are opening it writable. */
+
+ if (flags_writable(fi->flags) &&
+ (!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE)) {
+ u64 size = (lte) ? wim_resource_size(lte) : 0;
+ ret = extract_resource_to_staging_dir(inode, stream_id,
+ <e, size);
if (ret != 0)
return ret;
}
- ret = alloc_wimlib_fd(lte, &fd);
+ ret = alloc_wimlib_fd(inode, stream_id, lte, &fd);
if (ret != 0)
return ret;
- fd->dentry = dentry;
-
- /* The file resource may be in the staging directory (read-write
- * mounts only) or in the WIM. If it's in the staging
- * directory, we need to open a native file descriptor for the
- * corresponding file. Otherwise, we can read the file resource
- * directly from the WIM file if we are opening it read-only,
- * but we need to extract the resource to the staging directory
- * if we are opening it writable. */
- if (flags_writable(fi->flags) && !lte->staging_file_name) {
- ret = extract_resource_to_staging_dir(dentry, <e,
- lte->resource_entry.original_size);
- if (ret != 0)
- return ret;
- }
- if (lte->staging_file_name) {
+ if (lte && lte->resource_location == RESOURCE_IN_STAGING_FILE) {
fd->staging_fd = open(lte->staging_file_name, fi->flags);
if (fd->staging_fd == -1) {
close_wimlib_fd(fd);
return -errno;
}
}
- fi->fh = (uint64_t)fd;
+ fi->fh = (uintptr_t)fd;
return 0;
}
/* Opens a directory. */
static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
{
- struct dentry *dentry;
+ struct inode *inode;
+ int ret;
+ struct wimlib_fd *fd = NULL;
- dentry = get_dentry(w, path);
- if (!dentry || !dentry_is_directory(dentry))
+ inode = wim_pathname_to_inode(w, path);
+ if (!inode)
+ return -ENOENT;
+ if (!inode_is_directory(inode))
return -ENOTDIR;
- fi->fh = (uint64_t)dentry;
- return 0;
+ ret = alloc_wimlib_fd(inode, 0, NULL, &fd);
+ fi->fh = (uintptr_t)fd;
+ return ret;
}
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)
+ return -EBADF;
- if (!fd) {
- /* Empty file with no lookup table entry on read-only mounted
- * WIM */
- wimlib_assert(!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE));
+ if (!fd->lte) /* Empty stream with no lookup table entry */
return 0;
- }
- if (fd->lte->staging_file_name) {
+ if (fd->lte->resource_location == RESOURCE_IN_STAGING_FILE) {
/* Read from staging file */
+ wimlib_assert(fd->lte->staging_file_name);
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;
return -errno;
return ret;
} else {
-
/* Read from WIM */
- struct resource_entry *res_entry;
- int ctype;
+ u64 res_size = wim_resource_size(fd->lte);
- res_entry = &fd->lte->resource_entry;
-
- ctype = wim_resource_compression_type(w, res_entry);
-
- if (offset > res_entry->original_size)
+ if (offset > res_size)
return -EOVERFLOW;
- size = min(size, res_entry->original_size - offset);
+ size = min(size, res_size - offset);
- if (read_resource(w->fp, res_entry->size,
- res_entry->original_size,
- res_entry->offset, ctype, size,
- offset, buf) != 0)
+ if (read_wim_resource(fd->lte, (u8*)buf,
+ size, offset, false) != 0)
return -EIO;
return size;
}
/* Fills in the entries of the directory specified by @path using the
* FUSE-provided function @filler. */
static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
- off_t offset, struct fuse_file_info *fi)
+ off_t offset, struct fuse_file_info *fi)
{
- struct dentry *parent, *child;
-
- parent = (struct dentry*)fi->fh;
- child = parent->children;
+ struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
+ struct inode *inode;
+ struct dentry *child;
+
+ if (!fd)
+ return -EBADF;
+
+ inode = fd->f_inode;
filler(buf, ".", NULL, 0);
filler(buf, "..", NULL, 0);
+ child = inode->children;
+
if (!child)
return 0;
if (filler(buf, child->file_name_utf8, NULL, 0))
return 0;
child = child->next;
- } while (child != parent->children);
+ } while (child != inode->children);
return 0;
}
if (!dentry_is_symlink(dentry))
return -EINVAL;
- ret = dentry_readlink(dentry, buf, buf_len, w);
+ ret = inode_readlink(dentry->d_inode, buf, buf_len, w);
if (ret > 0)
ret = 0;
return ret;
/* Close a file. */
static int wimfs_release(const char *path, struct fuse_file_info *fi)
{
- int ret;
- struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+ struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
+ return close_wimlib_fd(fd);
+}
- if (!fd) {
- /* Empty file with no lookup table entry on read-only mounted
- * WIM */
- wimlib_assert(!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE));
- return 0;
- }
+/* Close a directory */
+static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
+{
+ struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
return close_wimlib_fd(fd);
}
+#ifdef ENABLE_XATTR
+/* Remove an alternate data stream through the XATTR interface */
+static int wimfs_removexattr(const char *path, const char *name)
+{
+ struct dentry *dentry;
+ struct ads_entry *ads_entry;
+ u16 ads_idx;
+ if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
+ return -ENOTSUP;
+
+ if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+ return -ENOATTR;
+ name += 5;
+
+ dentry = get_dentry(w, path);
+ if (!dentry)
+ return -ENOENT;
+
+ ads_entry = inode_get_ads_entry(dentry->d_inode, name, &ads_idx);
+ if (!ads_entry)
+ return -ENOATTR;
+ inode_remove_ads(dentry->d_inode, ads_idx, w->lookup_table);
+ return 0;
+}
+#endif
+
/* 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)
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) {
+ /* 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))
* directory */
if (!dentry_is_directory(dst))
return -ENOTDIR;
- if (dst->children != NULL)
+ if (dst->d_inode->children != NULL)
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 {
+ /* Destination does not exist */
parent_of_dst = get_parent_dentry(w, to);
if (!parent_of_dst)
return -ENOENT;
+
+ if (!dentry_is_directory(parent_of_dst))
+ return -ENOTDIR;
}
+ 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;
}
if (!dentry_is_empty_directory(dentry))
return -ENOTEMPTY;
- unlink_dentry(dentry);
- free_dentry(dentry);
+ remove_dentry(dentry, w->lookup_table);
+ 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)
+{
+ struct ads_entry *existing_ads_entry;
+ struct ads_entry *new_ads_entry;
+ struct lookup_table_entry *existing_lte;
+ struct lookup_table_entry *lte;
+ struct inode *inode;
+ u8 value_hash[SHA1_HASH_SIZE];
+ u16 ads_idx;
+
+ if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
+ return -ENOTSUP;
+
+ if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+ return -ENOATTR;
+ name += 5;
+
+ inode = wim_pathname_to_inode(w, path);
+ if (!inode)
+ return -ENOENT;
+
+ existing_ads_entry = inode_get_ads_entry(inode, name, &ads_idx);
+ if (existing_ads_entry) {
+ if (flags & XATTR_CREATE)
+ return -EEXIST;
+ inode_remove_ads(inode, ads_idx, w->lookup_table);
+ } else {
+ if (flags & XATTR_REPLACE)
+ return -ENOATTR;
+ }
+ new_ads_entry = inode_add_ads(inode, name);
+ if (!new_ads_entry)
+ return -ENOMEM;
+
+ sha1_buffer((const u8*)value, size, value_hash);
+
+ existing_lte = __lookup_resource(w->lookup_table, value_hash);
+
+ if (existing_lte) {
+ lte = existing_lte;
+ lte->refcnt++;
+ } else {
+ u8 *value_copy;
+ lte = new_lookup_table_entry();
+ if (!lte)
+ return -ENOMEM;
+ value_copy = MALLOC(size);
+ if (!value_copy) {
+ FREE(lte);
+ return -ENOMEM;
+ }
+ memcpy(value_copy, value, size);
+ lte->resource_location = RESOURCE_IN_ATTACHED_BUFFER;
+ lte->attached_buffer = value_copy;
+ lte->resource_entry.original_size = size;
+ lte->resource_entry.size = size;
+ lte->resource_entry.flags = 0;
+ copy_hash(lte->hash, value_hash);
+ lookup_table_insert(w->lookup_table, lte);
+ }
+ new_ads_entry->lte = lte;
return 0;
}
+#endif
static int wimfs_symlink(const char *to, const char *from)
{
struct dentry *dentry_parent, *dentry;
const char *link_name;
+ struct inode *inode;
dentry_parent = get_parent_dentry(w, from);
if (!dentry_parent)
if (get_dentry_child_with_name(dentry_parent, link_name))
return -EEXIST;
- dentry = new_dentry(link_name);
+ dentry = new_dentry_with_inode(link_name);
if (!dentry)
return -ENOMEM;
+ inode = dentry->d_inode;
- if (!change_dentry_name(dentry, link_name)) {
- FREE(dentry);
- return -ENOMEM;
- }
-
- if (calculate_dentry_full_path(dentry, NULL) != 0)
- goto out_free_dentry;
-
- dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
- dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
+ inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
+ inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
+ inode->ino = next_ino++;
+ inode->resolved = true;
- if (dentry_set_symlink(dentry, to, w->lookup_table) != 0)
+ if (inode_set_symlink(inode, to, w->lookup_table, NULL) != 0)
goto out_free_dentry;
link_dentry(dentry, dentry_parent);
struct dentry *dentry;
struct lookup_table_entry *lte;
int ret;
- u8 *dentry_hash;
+ u16 stream_idx;
+ u32 stream_id;
+ struct inode *inode;
ret = lookup_resource(w, path, get_lookup_flags(), &dentry,
- <e, &dentry_hash);
+ <e, &stream_idx);
if (ret != 0)
return ret;
if (!lte) /* Already a zero-length file */
return 0;
- if (lte->staging_file_name) {
+ inode = dentry->d_inode;
+
+ if (stream_idx == 0)
+ stream_id = 0;
+ else
+ stream_id = inode->ads_entries[stream_idx - 1].stream_id;
+
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ wimlib_assert(lte->staging_file_name);
ret = truncate(lte->staging_file_name, size);
if (ret != 0)
return -errno;
lte->resource_entry.original_size = size;
} else {
+ wimlib_assert(lte->resource_location == RESOURCE_IN_WIM);
/* File in WIM. Extract it to the staging directory, but only
* the first @size bytes of it. */
- ret = extract_resource_to_staging_dir(dentry, <e, size);
+ ret = extract_resource_to_staging_dir(inode, stream_id,
+ <e, size);
}
- dentry_update_all_timestamps(dentry);
return ret;
}
{
struct dentry *dentry;
struct lookup_table_entry *lte;
+ struct inode *inode;
int ret;
- u8 *dentry_hash;
+ u16 stream_idx;
+ unsigned i;
ret = lookup_resource(w, path, get_lookup_flags(), &dentry,
- <e, &dentry_hash);
+ <e, &stream_idx);
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);
- } else {
- /* We are removing an alternate data stream. */
- struct ads_entry *cur_entry = dentry->ads_entries;
- while (cur_entry->hash != dentry_hash)
- cur_entry++;
- lookup_table_decrement_refcnt(w->lookup_table, cur_entry->hash);
-
- dentry_remove_ads(dentry, cur_entry);
- }
- /* Beware: The lookup table entry(s) may still be referenced by users
- * that have opened the corresponding streams. They are freed later in
- * wimfs_release() when the last file user has closed the stream. */
+ if (stream_idx == 0)
+ remove_dentry(dentry, w->lookup_table);
+ else
+ inode_remove_ads(dentry->d_inode, stream_idx - 1, w->lookup_table);
return 0;
}
-/* Change the timestamp on a file dentry.
+#ifdef HAVE_UTIMENSAT
+/*
+ * Change the timestamp on a file dentry.
*
- * There is no distinction between a file and its alternate data streams here. */
+ * Note that alternate data streams do not have their own timestamps.
+ */
static int wimfs_utimens(const char *path, const struct timespec tv[2])
{
- struct dentry *dentry = get_dentry(w, path);
+ struct dentry *dentry;
+ struct inode *inode;
+ dentry = get_dentry(w, path);
+ if (!dentry)
+ return -ENOENT;
+ inode = dentry->d_inode;
+
+ if (tv[0].tv_nsec != UTIME_OMIT) {
+ if (tv[0].tv_nsec == UTIME_NOW)
+ inode->last_access_time = get_wim_timestamp();
+ else
+ inode->last_access_time = timespec_to_wim_timestamp(&tv[0]);
+ }
+ if (tv[1].tv_nsec != UTIME_OMIT) {
+ if (tv[1].tv_nsec == UTIME_NOW)
+ inode->last_write_time = get_wim_timestamp();
+ else
+ inode->last_write_time = timespec_to_wim_timestamp(&tv[1]);
+ }
+ return 0;
+}
+#else
+static int wimfs_utime(const char *path, struct utimbuf *times)
+{
+ struct dentry *dentry;
+ struct inode *inode;
+ dentry = get_dentry(w, path);
if (!dentry)
return -ENOENT;
- time_t last_access_t = (tv[0].tv_nsec == UTIME_NOW) ?
- time(NULL) : tv[0].tv_sec;
- dentry->last_access_time = unix_timestamp_to_ms(last_access_t);
- time_t last_mod_t = (tv[1].tv_nsec == UTIME_NOW) ?
- time(NULL) : tv[1].tv_sec;
- dentry->last_write_time = unix_timestamp_to_ms(last_mod_t);
+ inode = dentry->d_inode;
+
+ inode->last_write_time = unix_timestamp_to_wim(times->modtime);
+ inode->last_access_time = unix_timestamp_to_wim(times->actime);
return 0;
}
+#endif
/* Writes to a file in the WIM filesystem.
* It may be an alternate data stream, but here we don't even notice because we
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;
+ u64 now;
+
+ if (!fd)
+ return -EBADF;
wimlib_assert(fd->lte);
wimlib_assert(fd->lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
+ wimlib_assert(fd->f_inode);
+
+ /* 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);
-
+ now = get_wim_timestamp();
+ fd->f_inode->last_write_time = now;
+ fd->f_inode->last_access_time = now;
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,
+#if 0
+ .fallocate = wimfs_fallocate,
+#endif
+ .fgetattr = wimfs_fgetattr,
+ .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,
+ .opendir = wimfs_opendir,
+ .read = wimfs_read,
+ .readdir = wimfs_readdir,
+ .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,
+#ifdef HAVE_UTIMENSAT
+ .utimens = wimfs_utimens,
+#else
+ .utime = wimfs_utime,
+#endif
+ .write = wimfs_write,
};
/* 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[6];
+ char *argv[16];
int ret;
char *p;
+ struct lookup_table *joined_tab, *wim_tab_save;
+ struct image_metadata *imd;
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;
+
+ imd = &wim->image_metadata[image - 1];
+
+ DEBUG("Selected image %d", image);
+
+ next_ino = assign_inode_numbers(&imd->inode_list);
+
+ DEBUG("(next_ino = %"PRIu64")", next_ino);
+
+ /* Resolve all the lookup table entries of the dentry tree */
+ DEBUG("Resolving lookup table entries");
+ for_dentry_in_tree(imd->root_dentry, dentry_resolve_ltes,
+ wim->lookup_table);
if (flags & WIMLIB_MOUNT_FLAG_READWRITE)
- wim_get_current_image_metadata(wim)->modified = true;
+ imd->modified = true;
if (!(flags & (WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |
WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR |
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++] = "mount";
+ argv[argc++] = "imagex";
argv[argc++] = p;
argv[argc++] = "-s"; /* disable multi-threaded operation */
- if (flags & WIMLIB_MOUNT_FLAG_DEBUG) {
+ if (flags & WIMLIB_MOUNT_FLAG_DEBUG)
argv[argc++] = "-d";
- }
- if (!(flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
- argv[argc++] = "-o";
- argv[argc++] = "ro";
- } else {
+
+ /*
+ * We provide the use_ino option because we are going to assign inode
+ * numbers oursides. We've already numbered the inodes with unique
+ * numbers in the assign_inode_numbers() function, and the static
+ * variable next_ino is set to the next available inode number.
+ */
+ char optstring[256] = "use_ino,subtype=wimfs,attr_timeout=0";
+ argv[argc++] = "-o";
+ argv[argc++] = optstring;
+ if ((flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
+ /* Read-write mount. Make the staging directory */
make_staging_dir();
if (!staging_dir_name) {
FREE(p);
- return WIMLIB_ERR_MKDIR;
+ ret = WIMLIB_ERR_MKDIR;
+ goto out;
}
+ } else {
+ /* Read-only mount */
+ strcat(optstring, ",ro");
}
+ argv[argc] = NULL;
#ifdef ENABLE_DEBUG
{
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;
}
int msgsize;
int errno_save;
+ mount_dir = dir;
+
+ /* Open message queues between the unmount process and the
+ * filesystem daemon. */
+ ret = open_message_queues(false);
+ if (ret != 0)
+ return ret;
+
+ /* Send a message to the filesystem saying whether to commit or
+ * not. */
+ msg[0] = (flags & WIMLIB_UNMOUNT_FLAG_COMMIT) ? 1 : 0;
+ msg[1] = (flags & WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY) ? 1 : 0;
+
+ DEBUG("Sending message: %s, %s",
+ (msg[0] == 0) ? "don't commit" : "commit",
+ (msg[1] == 0) ? "don't check" : "check");
+ ret = mq_send(unmount_to_daemon_mq, msg, 2, 1);
+ if (ret == -1) {
+ ERROR("Failed to notify filesystem daemon whether we want to "
+ "commit changes or not");
+ close_message_queues();
+ return WIMLIB_ERR_MQUEUE;
+ }
+
/* Execute `fusermount -u', which is installed setuid root, to unmount
* the WIM.
*
* the WIM file.
*/
- mount_dir = dir;
+
pid = fork();
if (pid == -1) {
ERROR_WITH_ERRNO("Failed to fork()");
if (pid == 0) {
execlp("fusermount", "fusermount", "-u", dir, NULL);
ERROR_WITH_ERRNO("Failed to execute `fusermount'");
- return WIMLIB_ERR_FUSERMOUNT;
+ exit(WIMLIB_ERR_FUSERMOUNT);
}
- ret = waitpid(pid, &status, 0);
+ ret = wait(&status);
if (ret == -1) {
ERROR_WITH_ERRNO("Failed to wait for fusermount process to "
"terminate");
if (status != 0) {
ERROR("fusermount exited with status %d", status);
- return WIMLIB_ERR_FUSERMOUNT;
- }
- /* Open message queues between the unmount process and the
- * filesystem daemon. */
- ret = open_message_queues(false);
- if (ret != 0)
- return ret;
+ /* Try again, but with the `umount' program. This is required
+ * on other FUSE implementations such as FreeBSD's that do not
+ * have a `fusermount' program. */
- /* Send a message to the filesystem saying whether to commit or
- * not. */
- msg[0] = (flags & WIMLIB_UNMOUNT_FLAG_COMMIT) ? 1 : 0;
- msg[1] = (flags & WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY) ? 1 : 0;
+ pid = fork();
+ if (pid == -1) {
+ ERROR_WITH_ERRNO("Failed to fork()");
+ return WIMLIB_ERR_FORK;
+ }
+ if (pid == 0) {
+ execlp("umount", "umount", dir, NULL);
+ ERROR_WITH_ERRNO("Failed to execute `umount'");
+ exit(WIMLIB_ERR_FUSERMOUNT);
+ }
- DEBUG("Sending message: %s, %s",
- (msg[0] == 0) ? "don't commit" : "commit",
- (msg[1] == 0) ? "don't check" : "check");
- ret = mq_send(unmount_to_daemon_mq, msg, 2, 1);
- if (ret == -1) {
- ERROR("Failed to notify filesystem daemon whether we want to "
- "commit changes or not");
- close_message_queues();
- return WIMLIB_ERR_MQUEUE;
+ ret = wait(&status);
+ if (ret == -1) {
+ ERROR_WITH_ERRNO("Failed to wait for `umount' process to "
+ "terminate");
+ return WIMLIB_ERR_FUSERMOUNT;
+ }
+ if (status != 0) {
+ ERROR("`umount' exited with failure status");
+ return WIMLIB_ERR_FUSERMOUNT;
+ }
}
+
/* Wait for a message from the filesytem daemon indicating whether the
* filesystem was unmounted successfully (0) or an error occurred (1).
* This may take a long time if a big WIM file needs to be rewritten. */
* filesystem daemon has crashed or failed for some reason.
*
* XXX come up with some method to determine if the filesystem
- * daemon has really crashed or not. */
+ * daemon has really crashed or not.
+ *
+ * XXX Idea: have mount daemon write its PID into the WIM file header?
+ * */
gettimeofday(&now, NULL);
timeout.tv_sec = now.tv_sec + 600;
}
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();
}
git://wimlib.net / wimlib / blobdiff