* 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 <ftw.h>
#include <mqueue.h>
+#ifdef ENABLE_XATTR
+#include <attr/xattr.h>
+#endif
+
struct wimlib_fd {
u16 idx;
int staging_fd;
* numbers. */
static u64 next_link_group_id;
+/* 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);
}
+/*
+ * Allocate a file descriptor for a lookup table entry
+ */
static int alloc_wimlib_fd(struct lookup_table_entry *lte,
struct wimlib_fd **fd_ret)
{
return -EMFILE;
num_new_fds = min(fds_per_alloc, max_fds - lte->num_allocated_fds);
- fds = CALLOC(lte->num_allocated_fds + num_new_fds,
- sizeof(lte->fds[0]));
+ fds = REALLOC(lte->fds, (lte->num_allocated_fds + num_new_fds) *
+ sizeof(lte->fds[0]));
if (!fds)
return -ENOMEM;
- memcpy(fds, lte->fds,
- lte->num_allocated_fds * sizeof(lte->fds[0]));
- FREE(lte->fds);
+ memset(&fds[lte->num_allocated_fds], 0,
+ num_new_fds * sizeof(fds[0]));
lte->fds = fds;
lte->num_allocated_fds += num_new_fds;
}
wimlib_assert(lte);
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)
return -errno;
}
if (--lte->num_opened_fds == 0 && lte->refcnt == 0) {
- if (lte->staging_file_name)
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ wimlib_assert(lte->staging_file_name);
unlink(lte->staging_file_name);
+ }
free_lookup_table_entry(lte);
}
+ wimlib_assert(lte->fds[fd->idx] == fd);
lte->fds[fd->idx] = NULL;
FREE(fd);
return 0;
}
+/* Remove a dentry and all its alternate file streams */
static void remove_dentry(struct dentry *dentry,
struct lookup_table *lookup_table)
{
- const u8 *hash = dentry->hash;
+ wimlib_assert(dentry);
+ wimlib_assert(dentry->resolved);
+
+ struct lookup_table_entry *lte = dentry->lte;
u16 i = 0;
- struct lookup_table_entry *lte;
while (1) {
- lte = lookup_table_decrement_refcnt(lookup_table, hash);
+ lte = lte_decrement_refcnt(lte, lookup_table);
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;
+ lte = dentry->ads_entries[i].lte;
i++;
}
put_dentry(dentry);
}
-static void dentry_increment_lookup_table_refcnts(struct dentry *dentry,
- struct lookup_table *lookup_table)
+static void remove_ads(struct dentry *dentry,
+ struct ads_entry *ads_entry,
+ 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++;
+
+ wimlib_assert(dentry->resolved);
+
+ lte = lte_decrement_refcnt(ads_entry->lte, lookup_table);
+ if (lte)
+ list_del(&ads_entry->lte_group_list.list);
+ dentry_remove_ads(dentry, ads_entry);
+}
+
+/* Transfers file attributes from a struct dentry to a `stat' buffer. */
+int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf)
+{
+ struct lookup_table_entry *lte;
+
+ if (dentry_is_symlink(dentry))
+ stbuf->st_mode = S_IFLNK | 0777;
+ else if (dentry_is_directory(dentry))
+ stbuf->st_mode = S_IFDIR | 0755;
+ else
+ stbuf->st_mode = S_IFREG | 0644;
+
+ stbuf->st_ino = (ino_t)dentry->link_group_id;
+
+ stbuf->st_nlink = dentry_link_group_size(dentry);
+ stbuf->st_uid = getuid();
+ stbuf->st_gid = getgid();
+
+ /* Use the size of the unnamed (default) file stream. */
+ lte = dentry_unnamed_lte_resolved(dentry);
+ if (lte) {
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ wimlib_assert(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE);
+ wimlib_assert(lte->staging_file_name);
+ struct stat native_stat;
+ if (stat(lte->staging_file_name, &native_stat) != 0) {
+ DEBUG("Failed to stat `%s': %m",
+ lte->staging_file_name);
+ return -errno;
+ }
+ stbuf->st_size = native_stat.st_size;
+ } else {
+ stbuf->st_size = lte->resource_entry.original_size;
+ }
+ } else {
+ stbuf->st_size = 0;
}
+
+ stbuf->st_atime = wim_timestamp_to_unix(dentry->last_access_time);
+ stbuf->st_mtime = wim_timestamp_to_unix(dentry->last_write_time);
+ stbuf->st_ctime = wim_timestamp_to_unix(dentry->creation_time);
+ stbuf->st_blocks = (stbuf->st_size + 511) / 512;
+ return 0;
}
/* Creates a new staging file and returns its file descriptor opened for
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';
return fd;
}
+/*
+ * Removes open file descriptors from a lookup table entry @old_lte where the
+ * file descriptors have opened the corresponding file resource in the context
+ * of the hard link group @link_group; these file descriptors are extracted and
+ * placed in a new lookup table entry, which is returned.
+ */
+static struct lookup_table_entry *
+lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group)
+{
+ u16 num_transferred_fds;
+ struct lookup_table_entry *new_lte;
+
+ new_lte = new_lookup_table_entry();
+ if (!new_lte)
+ return NULL;
+
+ 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 &&
+ old_lte->fds[i]->dentry->link_group_id == link_group)
+ 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(new_lte);
+ return NULL;
+ }
+ for (u16 i = 0, j = 0; ; i++) {
+ if (old_lte->fds[i] && old_lte->fds[i]->dentry &&
+ old_lte->fds[i]->dentry->link_group_id == link_group) {
+ struct wimlib_fd *fd = old_lte->fds[i];
+ old_lte->fds[i] = NULL;
+ fd->lte = new_lte;
+ fd->idx = j;
+ new_lte->fds[j] = fd;
+ if (++j == num_transferred_fds)
+ break;
+ }
+ }
+ DEBUG("old_lte: %u fds open; new_lte: %u fds open",
+ old_lte->num_opened_fds, new_lte->num_opened_fds);
+ old_lte->num_opened_fds -= num_transferred_fds;
+ new_lte->num_opened_fds = num_transferred_fds;
+ new_lte->num_allocated_fds = num_transferred_fds;
+ return new_lte;
+}
+
+/*
+ * Transfers an alternate data stream entry to a new lookup table entry
+ */
+static void lte_transfer_ads_entry(struct lookup_table_entry *new_lte,
+ struct ads_entry *ads_entry)
+{
+ list_del(&ads_entry->lte_group_list.list);
+ list_add(&ads_entry->lte_group_list.list, &new_lte->lte_group_list);
+ ads_entry->lte = new_lte;
+}
+
+/*
+ * Transfers a dentry to a new lookup table entry
+ */
+static void lte_transfer_dentry(struct lookup_table_entry *new_lte,
+ struct dentry *dentry)
+{
+ wimlib_assert(dentry->lte_group_list.list.next);
+ wimlib_assert(new_lte->lte_group_list.next);
+ list_del(&dentry->lte_group_list.list);
+ list_add(&dentry->lte_group_list.list, &new_lte->lte_group_list);
+ dentry->lte = new_lte;
+}
+
+static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte,
+ struct dentry *dentry,
+ unsigned stream_idx)
+{
+ INIT_LIST_HEAD(&new_lte->lte_group_list);
+ if (stream_idx == 0) {
+ struct list_head *pos = &dentry->link_group_list;
+ do {
+ struct dentry *d;
+ d = container_of(pos, struct dentry, link_group_list);
+ wimlib_assert(d->link_group_id == dentry->link_group_id);
+ lte_transfer_dentry(new_lte, d);
+ pos = pos->next;
+ } while (pos != &dentry->link_group_list);
+ } else {
+ struct ads_entry *ads_entry;
+ wimlib_assert(stream_idx <= dentry->num_ads);
+ ads_entry = &dentry->ads_entries[stream_idx - 1];
+ lte_transfer_ads_entry(new_lte, ads_entry);
+ }
+}
+
/*
* 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
+ * @dentry, @stream_idx: The stream on whose behalf we are modifying the lookup
+ * table entry (these may be more streams than this that reference the lookup
+ * table entry)
+ *
+ * @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,
+ unsigned stream_idx,
struct lookup_table_entry **lte,
off_t size)
{
struct lookup_table_entry *old_lte, *new_lte;
size_t link_group_size;
+ /*
+ * 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. If there is no old lte, then this
+ * step does not need to be done
+ * - Transfer stream entries from the old lte's list to the new lte's list. If
+ * there is no old lte, we instead transfer entries for the hard link group.
+ *
+ * Note: *lte is permitted to be NULL, in which case there is no old
+ * lookup table entry.
+ */
+
DEBUG("Extracting resource `%s' to staging directory", dentry->full_path_utf8);
old_lte = *lte;
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) {
/* 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);
+ lookup_table_unlink(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 = %zu, 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
* one of them) */
- /* XXX The ADS really complicate things here and not
+ /* 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. */
+ * streams themselves are not hardlinked.
+ * XXX*/
wimlib_assert(old_lte->refcnt > link_group_size);
- new_lte = new_lookup_table_entry();
+ new_lte = lte_extract_fds(old_lte, dentry->link_group_id);
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++) {
- if (old_lte->fds[i] &&
- old_lte->fds[i]->dentry->hard_link ==
- dentry->hard_link)
- {
- 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(new_lte);
- ret = -ENOMEM;
- goto out_delete_staging_file;
- }
- for (u16 i = 0, j = 0; ; 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;
- fd->lte = new_lte;
- fd->idx = j;
- new_lte->fds[j] = fd;
- if (++j == num_transferred_fds)
- break;
- }
- }
+ lte_transfer_stream_entries(new_lte, dentry, stream_idx);
old_lte->refcnt -= link_group_size;
- 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 {
+ /* No old_lte was supplied, so the resource had no lookup table
+ * entry before (it must be an empty resource) */
new_lte = new_lookup_table_entry();
if (!new_lte) {
ret = -ENOMEM;
goto out_delete_staging_file;
}
+ lte_transfer_stream_entries(new_lte, dentry, stream_idx);
}
new_lte->resource_entry.original_size = size;
new_lte->refcnt = link_group_size;
- randomize_byte_array(new_lte->hash, WIM_HASH_SIZE);
+ random_hash(new_lte->hash);
+ if (new_lte->staging_file_name)
+ FREE(new_lte->staging_file_name);
new_lte->staging_file_name = staging_file_name;
+ new_lte->resource_location = RESOURCE_IN_STAGING_FILE;
lookup_table_insert(w->lookup_table, new_lte);
+ list_add(&new_lte->staging_list, &staging_list);
*lte = new_lte;
return 0;
out_delete_staging_file:
/* 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 close_lte_fds(struct lookup_table_entry *lte)
{
- for (u16 i = 0; i < lte->num_opened_fds; i++) {
+ for (u16 i = 0, j = 0; j < lte->num_opened_fds; i++) {
if (lte->fds[i] && lte->fds[i]->staging_fd != -1) {
+ wimlib_assert(lte->resource_location == RESOURCE_IN_STAGING_FILE);
+ wimlib_assert(lte->staging_file_name);
if (close(lte->fds[i]->staging_fd) != 0) {
ERROR_WITH_ERRNO("Failed close file `%s'",
lte->staging_file_name);
return WIMLIB_ERR_WRITE;
}
+ j++;
}
}
return 0;
}
+static void lte_list_change_lte_ptr(struct lookup_table_entry *lte,
+ struct lookup_table_entry *newptr)
+{
+ struct list_head *pos;
+ struct stream_list_head *head;
+ list_for_each(pos, <e->lte_group_list) {
+ head = container_of(pos, struct stream_list_head, list);
+ if (head->type == STREAM_TYPE_ADS) {
+ struct ads_entry *ads_entry;
+ ads_entry = container_of(head, struct ads_entry, lte_group_list);
+
+ ads_entry->lte = newptr;
+ } else {
+ wimlib_assert(head->type == STREAM_TYPE_NORMAL);
-/* 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)
+ struct dentry *dentry;
+ dentry = container_of(head, struct dentry, lte_group_list);
+
+ dentry->lte = newptr;
+ }
+ }
+}
+
+
+static int update_lte_of_staging_file(struct lookup_table_entry *lte,
+ struct lookup_table *table)
{
- 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);
- 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);
- }
+ 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 */
+
+ lte_list_change_lte_ptr(lte, duplicate_lte);
+ duplicate_lte->refcnt += lte->refcnt;
+ list_splice(<e->lte_group_list,
+ &duplicate_lte->lte_group_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;
}
- if (i == dentry->num_ads)
- break;
- hash = dentry->ads_entries[i].hash;
- i++;
+ 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;
+ lookup_table_insert(table, lte);
}
+
return 0;
}
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;
+ DEBUG("Closing all staging file descriptors.");
+ list_for_each_entry(lte, &staging_list, staging_list) {
+ ret = close_lte_fds(lte);
+ 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;
+ DEBUG("Calculating SHA1 checksums for all new staging files.");
+ 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);
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*)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);
}
static int wimfs_fgetattr(const char *path, struct stat *stbuf,
struct fuse_file_info *fi)
{
- struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
- return dentry_to_stbuf(fd->dentry, stbuf, w->lookup_table);
+ 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;
*/
static int wimfs_getattr(const char *path, struct stat *stbuf)
{
- struct dentry *dentry = get_dentry(w, path);
- if (!dentry)
- return -ENOENT;
- return dentry_to_stbuf(dentry, stbuf, w->lookup_table);
+ struct dentry *dentry;
+ int ret;
+
+ ret = lookup_resource(w, path,
+ get_lookup_flags() | LOOKUP_FLAG_DIRECTORY_OK,
+ &dentry, NULL, NULL);
+ if (ret != 0)
+ return ret;
+ 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)
{
- /* XXX */
- return -ENOTSUP;
+ 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;
+ ads_entry = dentry_get_ads_entry(dentry, name);
+ 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)
FREE(from_dentry);
return -ENOMEM;
}
+
+ /* Add the new dentry to the dentry list for the link group */
list_add(&from_dentry->link_group_list, &to_dentry->link_group_list);
+
+ /* Increment reference counts for the unnamed file stream and all
+ * alternate data streams. */
+ if (from_dentry->lte) {
+ list_add(&from_dentry->lte_group_list.list,
+ &to_dentry->lte_group_list.list);
+ from_dentry->lte->refcnt++;
+ }
+ for (u16 i = 0; i < from_dentry->num_ads; i++) {
+ struct ads_entry *ads_entry = &from_dentry->ads_entries[i];
+ if (ads_entry->lte)
+ ads_entry->lte->refcnt++;
+ }
+
+ /* The ADS entries are owned by another dentry. */
+ from_dentry->ads_entries_status = ADS_ENTRIES_USER;
+
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;
}
+#ifdef ENABLE_XATTR
static int wimfs_listxattr(const char *path, char *list, size_t size)
{
- /* XXX */
- return -ENOTSUP;
+ struct dentry *dentry;
+ int ret;
+ char *p = list;
+ size_t needed_size;
+ unsigned i;
+ 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;
+ if (size == 0) {
+ needed_size = 0;
+ for (i = 0; i < dentry->num_ads; i++)
+ needed_size += dentry->ads_entries[i].stream_name_utf8_len + 6;
+ return needed_size;
+ } else {
+ for (i = 0; i < dentry->num_ads; i++) {
+ needed_size = dentry->ads_entries[i].stream_name_utf8_len + 6;
+ if (needed_size > size)
+ return -ERANGE;
+ p += sprintf(p, "user.%s",
+ dentry->ads_entries[i].stream_name_utf8) + 1;
+ size -= needed_size;
+ }
+ return p - list;
+ }
}
+#endif
/*
* Create a directory in the WIM.
newdir = new_dentry(basename);
newdir->attributes |= FILE_ATTRIBUTE_DIRECTORY;
+ newdir->resolved = true;
+ newdir->link_group_id = next_link_group_id++;
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;
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);
dentry = new_dentry(basename);
if (!dentry)
return -ENOMEM;
- dentry->hard_link = next_link_group_id++;
+ dentry->resolved = true;
+ dentry->link_group_id = next_link_group_id++;
+ dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
+ INIT_LIST_HEAD(&dentry->lte_group_list.list);
link_dentry(dentry, parent);
}
return 0;
{
struct dentry *dentry;
struct lookup_table_entry *lte;
- u8 *dentry_hash;
int ret;
struct wimlib_fd *fd;
+ unsigned stream_idx;
ret = lookup_resource(w, path, get_lookup_flags(), &dentry, <e,
- &dentry_hash);
+ &stream_idx);
if (ret != 0)
return ret;
return 0;
}
- ret = extract_resource_to_staging_dir(dentry, <e, 0);
+ ret = extract_resource_to_staging_dir(dentry, stream_idx,
+ <e, 0);
if (ret != 0)
return ret;
- memcpy(dentry_hash, lte->hash, WIM_HASH_SIZE);
}
ret = alloc_wimlib_fd(lte, &fd);
* 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,
+ if (flags_writable(fi->flags) &&
+ lte->resource_location != RESOURCE_IN_STAGING_FILE) {
+ ret = extract_resource_to_staging_dir(dentry, stream_idx, <e,
lte->resource_entry.original_size);
if (ret != 0)
return ret;
- memcpy(dentry_hash, lte->hash, WIM_HASH_SIZE);
}
- if (lte->staging_file_name) {
+ if (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;
}
if (!dentry_is_directory(dentry))
return -ENOTDIR;
dentry->num_times_opened++;
- fi->fh = (uint64_t)dentry;
+ fi->fh = (uintptr_t)dentry;
return 0;
}
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
return 0;
}
- if (fd->lte->staging_file_name) {
+ wimlib_assert(fd->lte);
+
+ 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;
return -errno;
return ret;
} else {
-
/* Read from WIM */
- struct resource_entry *res_entry;
- int ctype;
+ const struct resource_entry *res_entry;
res_entry = &fd->lte->resource_entry;
- ctype = wim_resource_compression_type(w, res_entry);
-
if (offset > res_entry->original_size)
return -EOVERFLOW;
size = min(size, res_entry->original_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;
+ parent = (struct dentry*)(uintptr_t)fi->fh;
+ wimlib_assert(parent);
child = parent->children;
filler(buf, ".", NULL, 0);
/* 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;
if (!fd) {
/* Empty file with no lookup table entry on read-only mounted
}
if (flags_writable(fi->flags) && fd->dentry) {
- u64 now = get_timestamp();
+ u64 now = get_wim_timestamp();
fd->dentry->last_access_time = now;
fd->dentry->last_write_time = now;
}
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);
if (--dentry->num_times_opened == 0)
free_dentry(dentry);
return 0;
}
+#ifdef ENABLE_XATTR
+/* Remove an alternate data stream through the XATTR interface */
static int wimfs_removexattr(const char *path, const char *name)
{
- /* XXX */
- return -ENOTSUP;
+ struct dentry *dentry;
+ struct ads_entry *ads_entry;
+ 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 = dentry_get_ads_entry(dentry, name);
+ if (!ads_entry)
+ return -ENOATTR;
+ 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)
return -ENOMEM;
if (dst) {
+ /* Destination file exists */
+
if (src == dst) /* Same file */
return 0;
parent_of_dst = dst->parent;
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);
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)
{
- /* XXX */
- return -ENOTSUP;
+ struct dentry *dentry;
+ struct ads_entry *existing_ads_entry;
+ struct ads_entry *new_ads_entry;
+ struct lookup_table_entry *existing_lte;
+ struct lookup_table_entry *lte;
+ u8 value_hash[SHA1_HASH_SIZE];
+
+ 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;
+ existing_ads_entry = dentry_get_ads_entry(dentry, name);
+ if (existing_ads_entry) {
+ if (flags & XATTR_CREATE)
+ return -EEXIST;
+ remove_ads(dentry, existing_ads_entry, w->lookup_table);
+ } else {
+ if (flags & XATTR_REPLACE)
+ return -ENOATTR;
+ }
+ new_ads_entry = dentry_add_ads(dentry, 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 lookup_table_entry *lte;
dentry_parent = get_parent_dentry(w, from);
if (!dentry_parent)
dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
+ dentry->link_group_id = next_link_group_id++;
- if (dentry_set_symlink(dentry, to, w->lookup_table) != 0)
+ if (dentry_set_symlink(dentry, to, w->lookup_table, <e) != 0)
goto out_free_dentry;
+ wimlib_assert(lte);
+
+ dentry->ads_entries[1].lte_group_list.type = STREAM_TYPE_ADS;
+ list_add(&dentry->ads_entries[1].lte_group_list.list,
+ <e->lte_group_list);
+ wimlib_assert(dentry->resolved);
+
link_dentry(dentry, dentry_parent);
return 0;
out_free_dentry:
struct dentry *dentry;
struct lookup_table_entry *lte;
int ret;
- u8 *dentry_hash;
+ unsigned stream_idx;
ret = lookup_resource(w, path, get_lookup_flags(), &dentry,
- <e, &dentry_hash);
+ <e, &stream_idx);
if (ret != 0)
return ret;
} else {
/* 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(dentry, stream_idx,
+ <e, size);
}
dentry_update_all_timestamps(dentry);
return ret;
struct dentry *dentry;
struct lookup_table_entry *lte;
int ret;
- u8 *dentry_hash;
+ unsigned stream_idx;
ret = lookup_resource(w, path, get_lookup_flags(), &dentry,
- <e, &dentry_hash);
+ <e, &stream_idx);
if (ret != 0)
return ret;
- if (dentry_hash == dentry->hash) {
+ if (stream_idx == 0) {
/* We are removing the full dentry including all alternate data
* streams. */
remove_dentry(dentry, w->lookup_table);
} 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);
+ remove_ads(dentry, &dentry->ads_entries[stream_idx - 1],
+ w->lookup_table);
}
/* Beware: The lookup table entry(s) may still be referenced by users
* that have opened the corresponding streams. They are freed later in
return 0;
}
-/* Change the timestamp on a file dentry.
+/*
+ * 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);
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);
+ if (tv[0].tv_nsec != UTIME_OMIT) {
+ if (tv[0].tv_nsec == UTIME_NOW)
+ dentry->last_access_time = get_wim_timestamp();
+ else
+ dentry->last_access_time = timespec_to_wim_timestamp(&tv[0]);
+ }
+ if (tv[1].tv_nsec != UTIME_OMIT) {
+ if (tv[1].tv_nsec == UTIME_NOW)
+ dentry->last_write_time = get_wim_timestamp();
+ else
+ dentry->last_write_time = timespec_to_wim_timestamp(&tv[1]);
+ }
return 0;
}
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);
wimlib_assert(fd->lte);
wimlib_assert(fd->lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
return ret;
}
-
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,
.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,
};
+static int check_lte_refcnt(struct lookup_table_entry *lte, void *ignore)
+{
+ size_t lte_group_size = 0;
+ struct list_head *cur;
+ list_for_each(cur, <e->lte_group_list)
+ lte_group_size++;
+ if (lte_group_size > lte->refcnt) {
+#ifdef ENABLE_ERROR_MESSAGES
+ struct dentry *example_dentry;
+ struct list_head *next;
+ struct stream_list_head *head;
+ WARNING("The following lookup table entry has a reference count "
+ "of %u, but", lte->refcnt);
+ WARNING("We found %zu references to it", lte_group_size);
+ next = lte->lte_group_list.next;
+ head = container_of(next, struct stream_list_head, list);
+ if (head->type == STREAM_TYPE_NORMAL) {
+ example_dentry = container_of(head, struct dentry,
+ lte_group_list);
+ WARNING("(One dentry referencing it is at `%s')",
+ example_dentry->full_path_utf8);
+ }
+ print_lookup_table_entry(lte);
+#endif
+ /* Guess what! install.wim for Windows 8 contains a stream with
+ * 2 dentries referencing it, but the lookup table entry has
+ * reference count of 1. So we will need to handle this case
+ * and not just make it be an error... I'm just setting the
+ * reference count to the number of references we found. */
+
+ #if 1
+ lte->refcnt = lte_group_size;
+ WARNING("Fixing reference count");
+ #else
+ return WIMLIB_ERR_INVALID_DENTRY;
+ #endif
+ }
+ return 0;
+}
+
/* 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_groups(wim->image_metadata[image - 1].lgt);
+ 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)
+ goto out;
if (flags & WIMLIB_MOUNT_FLAG_READWRITE)
wim_get_current_image_metadata(wim)->modified = true;
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";
- }
+
+ /*
+ * We provide the use_ino option because we are going to assign inode
+ * numbers oursides. We've already numbered the hard link groups with
+ * unique numbers with the assign_link_groups() function, and the static
+ * variable next_link_group_id is set to the next available link group
+ * ID that we will assign to new dentries.
+ */
char optstring[256] = "use_ino";
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;
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;
}
* 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