* 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
struct wimlib_fd {
u16 idx;
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);
put_dentry(dentry);
}
+static void remove_ads(struct dentry *dentry,
+ struct ads_entry *ads_entry,
+ struct lookup_table *lookup_table)
+{
+ struct lookup_table_entry *lte;
+
+ 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)
{
else
stbuf->st_mode = S_IFREG | 0644;
- stbuf->st_ino = (ino_t)dentry->hard_link;
+ 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_first_lte_resolved(dentry);
+ lte = dentry_unnamed_lte_resolved(dentry);
if (lte) {
- if (lte->staging_file_name) {
+ 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",
static struct lookup_table_entry *
lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group)
{
- int ret;
u16 num_transferred_fds;
struct lookup_table_entry *new_lte;
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->hard_link == link_group)
+ old_lte->fds[i]->dentry->link_group_id == link_group)
num_transferred_fds++;
DEBUG("Transferring %u file descriptors",
num_transferred_fds);
}
for (u16 i = 0, j = 0; ; i++) {
if (old_lte->fds[i] && old_lte->fds[i]->dentry &&
- old_lte->fds[i]->dentry->hard_link == link_group) {
+ 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;
do {
struct dentry *d;
d = container_of(pos, struct dentry, link_group_list);
- wimlib_assert(d->hard_link == dentry->hard_link);
+ 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);
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) {
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
* XXX*/
wimlib_assert(old_lte->refcnt > link_group_size);
- new_lte = lte_extract_fds(old_lte, dentry->hard_link);
+ new_lte = lte_extract_fds(old_lte, dentry->link_group_id);
if (!new_lte) {
ret = -ENOMEM;
goto out_delete_staging_file;
new_lte->resource_entry.original_size = size;
new_lte->refcnt = link_group_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);
* 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,
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;
{
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);
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);
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;
lookup_table_insert(table, lte);
}
if (ret != 0)
return ret;
}
- if (ret != 0)
- return ret;
xml_update_image_info(w, w->current_image);
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;
+ 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;
+ 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)
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->hard_link = next_link_group_id++;
+ newdir->link_group_id = next_link_group_id++;
link_dentry(newdir, parent);
return 0;
}
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)
return -ENOMEM;
dentry->resolved = true;
- dentry->hard_link = next_link_group_id++;
+ 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);
{
struct dentry *dentry;
struct lookup_table_entry *lte;
- u8 *dentry_hash;
int ret;
struct wimlib_fd *fd;
unsigned stream_idx;
* 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) {
+ 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;
}
- 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
wimlib_assert(fd->lte);
- 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;
} 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;
}
{
struct dentry *parent, *child;
- parent = (struct dentry*)fi->fh;
+ parent = (struct dentry*)(uintptr_t)fi->fh;
wimlib_assert(parent);
child = parent->children;
return ret;
}
+/* Creation time, write time, access time */
+static void
+dentry_link_group_set_times(struct dentry *dentry, u64 times[3])
+{
+ struct dentry *cur = dentry;
+ do {
+ if (times[0])
+ cur->creation_time = times[0];
+ if (times[1])
+ cur->last_write_time = times[1];
+ if (times[2])
+ cur->last_access_time = times[2];
+ } while ((cur = container_of(dentry->link_group_list.next,
+ struct dentry,
+ link_group_list)) != dentry);
+}
+
+static void
+dentry_link_group_update_times(struct dentry *dentry)
+{
+ u64 now = get_wim_timestamp();
+ u64 times[3] = {now, now, now};
+ dentry_link_group_set_times(dentry, times);
+}
+
/* 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
return 0;
}
- if (flags_writable(fi->flags) && fd->dentry) {
- u64 now = get_wim_timestamp();
- fd->dentry->last_access_time = now;
- fd->dentry->last_write_time = now;
- }
-
return close_wimlib_fd(fd);
}
static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
{
- struct dentry *dentry = (struct dentry *)fi->fh;
+ struct dentry *dentry = (struct dentry *)(uintptr_t)fi->fh;
wimlib_assert(dentry);
wimlib_assert(dentry->num_times_opened);
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 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)
{
dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
- dentry->hard_link = next_link_group_id++;
+ dentry->link_group_id = next_link_group_id++;
if (dentry_set_symlink(dentry, to, w->lookup_table, <e) != 0)
goto out_free_dentry;
ret = extract_resource_to_staging_dir(dentry, stream_idx,
<e, size);
}
- dentry_update_all_timestamps(dentry);
+ dentry_link_group_update_times(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,
remove_dentry(dentry, w->lookup_table);
} else {
/* We are removing an alternate data stream. */
- struct ads_entry *ads_entry;
-
- ads_entry = &dentry->ads_entries[stream_idx - 1];
- lte = lte_decrement_refcnt(lte, w->lookup_table);
- if (lte)
- list_del(&ads_entry->lte_group_list.list);
- dentry_remove_ads(dentry, ads_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;
}
+#ifdef HAVE_UTIMENSAT
/*
* Change the timestamp on a file dentry.
*
struct dentry *dentry = get_dentry(w, path);
if (!dentry)
return -ENOENT;
+ u64 times[3] = {0, 0, 0};
if (tv[0].tv_nsec != UTIME_OMIT) {
if (tv[0].tv_nsec == UTIME_NOW)
- dentry->last_access_time = get_wim_timestamp();
+ times[2] = get_wim_timestamp();
else
- dentry->last_access_time = timespec_to_wim_timestamp(&tv[0]);
+ times[2] = 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();
+ times[1] = get_wim_timestamp();
else
- dentry->last_write_time = timespec_to_wim_timestamp(&tv[1]);
+ times[1] = timespec_to_wim_timestamp(&tv[1]);
}
+ dentry_link_group_set_times(dentry, times);
+ return 0;
+}
+#else
+static int wimfs_utime(const char *path, struct utimbuf *times)
+{
+ struct dentry *dentry = get_dentry(w, path);
+ if (!dentry)
+ return -ENOENT;
+ u64 wim_times[3];
+ wim_times[0] = 0;
+ wim_times[1] = unix_timestamp_to_wim(times->modtime);
+ wim_times[2] = unix_timestamp_to_wim(times->actime);
+ dentry_link_group_set_times(dentry, wim_times);
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;
wimlib_assert(fd);
if (ret == -1)
return -errno;
+ if (fd->dentry) {
+ u64 now = get_wim_timestamp();
+ u64 times[3] = {0, now, now};
+ dentry_link_group_set_times(fd->dentry, times);
+ }
+
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,
+#ifdef HAVE_UTIMENSAT
.utimens = wimfs_utimens,
+#else
+ .utime = wimfs_utime,
+#endif
.write = wimfs_write,
};
lte_group_size++;
if (lte_group_size > lte->refcnt) {
#ifdef ENABLE_ERROR_MESSAGES
- ERROR("The following lookup table entry has a reference count "
+ 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);
- ERROR("We found %u references to it", lte_group_size);
+ 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)
- return ret;
+ 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++] = "imagex";
argv[argc++] = p;
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");
}
+ strcat(optstring, ",subtype=wimfs,attr_timeout=0");
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. */
}
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