*/
/*
- * Copyright (C) 2012, 2013 Biggers
+ * Copyright (C) 2012, 2013, 2014 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
-#include "wimlib_internal.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/error.h"
#ifdef WITH_FUSE
-#include "sha1.h"
-#include "lookup_table.h"
-#include "xml.h"
-#include "buffer_io.h"
-#include "timestamp.h"
+#ifdef __WIN32__
+# error "FUSE mount not supported on Win32! Please configure --without-fuse"
+#endif
+
+#include "wimlib/encoding.h"
+#include "wimlib/file_io.h"
+#include "wimlib/dentry.h"
+#include "wimlib/inode.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/paths.h"
+#include "wimlib/progress.h"
+#include "wimlib/reparse.h"
+#include "wimlib/resource.h"
+#include "wimlib/timestamp.h"
+#include "wimlib/version.h"
+#include "wimlib/write.h"
+#include "wimlib/xml.h"
+
+#include <errno.h>
+#include <ftw.h>
#include <limits.h>
+#include <mqueue.h>
+#include <signal.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#define FUSE_USE_VERSION 26
-#include <errno.h>
#include <string.h>
+#include <sys/stat.h>
#include <sys/time.h>
-#include <fuse.h>
-#include <ftw.h>
-#include <mqueue.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
#include <utime.h>
-#include <signal.h>
+
+#define FUSE_USE_VERSION 26
+#include <fuse.h>
#ifdef ENABLE_XATTR
#include <attr/xattr.h>
struct wimfs_fd {
struct wim_inode *f_inode;
struct wim_lookup_table_entry *f_lte;
- int staging_fd;
+ struct filedes staging_fd;
u16 idx;
u32 stream_id;
};
* filesystem anyway. */
u64 next_ino;
- /* List of lookup table entries for files in the staging directory */
- struct list_head staging_list;
-
/* List of inodes in the mounted image */
- struct hlist_head *image_inode_list;
+ struct list_head *image_inode_list;
+
+ /* Original list of streams in the mounted image, linked by
+ * mount_orig_stream_list. */
+ struct list_head orig_stream_list;
/* Name and message queue descriptors for message queues between the
* filesystem daemon process and the unmount process. These are used
* when the filesystem is unmounted and the process running
- * wimlib_unmount_image() (i.e. the `imagex unmount' command) needs to
- * communicate with the filesystem daemon running fuse_main() (i.e. the
- * daemon created by the `imagex mount' or `imagex mountrw' commands */
+ * wimlib_unmount_image() needs to communicate with the filesystem
+ * daemon running fuse_main() (i.e. the process created by a call to
+ * wimlib_mount_image(). */
char *unmount_to_daemon_mq_name;
char *daemon_to_unmount_mq_name;
mqd_t unmount_to_daemon_mq;
bool have_status;
};
-static void init_wimfs_context(struct wimfs_context *ctx)
+static void
+init_wimfs_context(struct wimfs_context *ctx)
{
memset(ctx, 0, sizeof(*ctx));
ctx->unmount_to_daemon_mq = (mqd_t)-1;
ctx->daemon_to_unmount_mq = (mqd_t)-1;
- INIT_LIST_HEAD(&ctx->staging_list);
}
#define WIMFS_CTX(fuse_ctx) ((struct wimfs_context*)(fuse_ctx)->private_data)
-static inline struct wimfs_context *wimfs_get_context()
+static inline struct wimfs_context *
+wimfs_get_context(void)
{
return WIMFS_CTX(fuse_get_context());
}
-static inline WIMStruct *wimfs_get_WIMStruct()
+static inline WIMStruct *
+wimfs_get_WIMStruct(void)
{
return wimfs_get_context()->wim;
}
-static inline bool wimfs_ctx_readonly(const struct wimfs_context *ctx)
-{
- return (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) == 0;
-}
-
-static inline int get_lookup_flags(const struct wimfs_context *ctx)
+static inline int
+get_lookup_flags(const struct wimfs_context *ctx)
{
return ctx->default_lookup_flags;
}
/* Returns nonzero if write permission is requested on the file open flags */
-static inline int flags_writable(int open_flags)
+static inline int
+flags_writable(int open_flags)
{
- return open_flags & (O_RDWR | O_WRONLY);
+ int accmode = (open_flags & O_ACCMODE);
+ return (accmode == O_RDWR || accmode == O_WRONLY);
}
/*
* @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.
- * @readonly: True if this is a read-only mount.
*
- * Return 0 iff successful or error code if unsuccessful.
+ * Return 0 iff successful or negative error code if unsuccessful.
*/
-static int alloc_wimfs_fd(struct wim_inode *inode,
- u32 stream_id,
- struct wim_lookup_table_entry *lte,
- struct wimfs_fd **fd_ret,
- bool readonly)
+static int
+alloc_wimfs_fd(struct wim_inode *inode,
+ u32 stream_id,
+ struct wim_lookup_table_entry *lte,
+ struct wimfs_fd **fd_ret)
{
static const u16 fds_per_alloc = 8;
static const u16 max_fds = 0xffff;
- int ret;
-
- pthread_mutex_lock(&inode->i_mutex);
DEBUG("Allocating fd for stream ID %u from inode %#"PRIx64" "
"(open = %u, allocated = %u)",
struct wimfs_fd **fds;
u16 num_new_fds;
- if (inode->i_num_allocated_fds == max_fds) {
- ret = -EMFILE;
- goto out;
- }
+ if (inode->i_num_allocated_fds == max_fds)
+ return -EMFILE;
+
num_new_fds = min(fds_per_alloc,
max_fds - inode->i_num_allocated_fds);
fds = REALLOC(inode->i_fds,
(inode->i_num_allocated_fds + num_new_fds) *
sizeof(inode->i_fds[0]));
- if (!fds) {
- ret = -ENOMEM;
- goto out;
- }
+ if (!fds)
+ return -ENOMEM;
+
memset(&fds[inode->i_num_allocated_fds], 0,
num_new_fds * sizeof(fds[0]));
inode->i_fds = fds;
for (u16 i = 0; ; i++) {
if (!inode->i_fds[i]) {
struct wimfs_fd *fd = CALLOC(1, sizeof(*fd));
- if (!fd) {
- ret = -ENOMEM;
- break;
- }
- fd->f_inode = inode;
- fd->f_lte = lte;
- fd->staging_fd = -1;
- fd->idx = i;
- fd->stream_id = stream_id;
- *fd_ret = fd;
- inode->i_fds[i] = fd;
+ if (!fd)
+ return -ENOMEM;
+
+ fd->f_inode = inode;
+ fd->f_lte = lte;
+ filedes_invalidate(&fd->staging_fd);
+ fd->idx = i;
+ fd->stream_id = stream_id;
+ *fd_ret = fd;
+ inode->i_fds[i] = fd;
inode->i_num_opened_fds++;
- if (lte && !readonly)
+ if (lte)
lte->num_opened_fds++;
DEBUG("Allocated fd (idx = %u)", fd->idx);
- ret = 0;
- break;
+ return 0;
}
}
-out:
- pthread_mutex_unlock(&inode->i_mutex);
- return ret;
}
-static void inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
+static void
+inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
{
wimlib_assert(inode != NULL);
-
- pthread_mutex_lock(&inode->i_mutex);
-
wimlib_assert(fd->f_inode == inode);
wimlib_assert(inode->i_num_opened_fds != 0);
wimlib_assert(fd->idx < inode->i_num_allocated_fds);
inode->i_fds[fd->idx] = NULL;
FREE(fd);
- if (--inode->i_num_opened_fds == 0 && inode->i_nlink == 0) {
- pthread_mutex_unlock(&inode->i_mutex);
- free_inode(inode);
- } else {
- pthread_mutex_unlock(&inode->i_mutex);
+ if (--inode->i_num_opened_fds == 0) {
+ FREE(inode->i_fds);
+ inode->i_fds = NULL;
+ inode->i_num_allocated_fds = 0;
+ if (inode->i_nlink == 0)
+ free_inode(inode);
}
}
-static int lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
+static int
+lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
{
wimlib_assert(fd->f_lte == lte);
/* Close staging file descriptor if needed. */
if (lte->resource_location == RESOURCE_IN_STAGING_FILE
- && fd->staging_fd != -1)
+ && filedes_valid(&fd->staging_fd))
{
- if (close(fd->staging_fd) != 0) {
+ if (filedes_close(&fd->staging_fd)) {
ERROR_WITH_ERRNO("Failed to close staging file");
return -errno;
}
}
/* Close a file descriptor. */
-static int close_wimfs_fd(struct wimfs_fd *fd)
+static int
+close_wimfs_fd(struct wimfs_fd *fd)
{
int ret;
DEBUG("Closing fd (ino = %#"PRIx64", opened = %u, allocated = %u)",
fd->f_inode->i_ino, fd->f_inode->i_num_opened_fds,
fd->f_inode->i_num_allocated_fds);
ret = lte_put_fd(fd->f_lte, fd);
- if (ret != 0)
+ if (ret)
return ret;
inode_put_fd(fd->f_inode, fd);
return 0;
}
+static mode_t
+fuse_mask_mode(mode_t mode, struct fuse_context *fuse_ctx)
+{
+#if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8)
+ mode &= ~fuse_ctx->umask;
+#endif
+ return mode;
+}
+
/*
* Add a new dentry with a new inode to a WIM image.
*
* Returns 0 on success, or negative error number on failure.
*/
-static int create_dentry(struct fuse_context *fuse_ctx,const char *path,
- mode_t mode, int attributes,
- struct wim_dentry **dentry_ret)
+static int
+create_dentry(struct fuse_context *fuse_ctx, const char *path,
+ mode_t mode, int attributes, struct wim_dentry **dentry_ret)
{
struct wim_dentry *parent;
struct wim_dentry *new;
const char *basename;
struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
+ int ret;
- parent = get_parent_dentry(wimfs_ctx->wim, path);
+ parent = get_parent_dentry(wimfs_ctx->wim, path, WIMLIB_CASE_SENSITIVE);
if (!parent)
return -errno;
return -ENOTDIR;
basename = path_basename(path);
- if (get_dentry_child_with_name(parent, basename))
+ if (get_dentry_child_with_name(parent, basename, WIMLIB_CASE_SENSITIVE))
return -EEXIST;
- new = new_dentry_with_inode(basename);
- if (!new)
- return -errno;
+ ret = new_dentry_with_inode(basename, &new);
+ if (ret)
+ return -ENOMEM;
new->d_inode->i_resolved = 1;
new->d_inode->i_ino = wimfs_ctx->next_ino++;
new->d_inode->i_attributes = attributes;
if (wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
- if (inode_set_unix_data(new->d_inode,
- fuse_ctx->uid,
- fuse_ctx->gid,
- mode & ~fuse_ctx->umask,
- wimfs_ctx->wim->lookup_table,
- UNIX_DATA_ALL | UNIX_DATA_CREATE))
- {
- free_dentry(new);
- return -ENOMEM;
- }
+ new->d_inode->i_unix_data.uid = fuse_ctx->uid;
+ new->d_inode->i_unix_data.gid = fuse_ctx->gid;
+ new->d_inode->i_unix_data.mode = fuse_mask_mode(mode, fuse_ctx);
}
dentry_add_child(parent, new);
- hlist_add_head(&new->d_inode->i_hlist, wimfs_ctx->image_inode_list);
+ list_add_tail(&new->d_inode->i_list, wimfs_ctx->image_inode_list);
if (dentry_ret)
*dentry_ret = new;
return 0;
}
-/* Remove a dentry from a mounted WIM image; i.e. remove an alias for 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 corresponding
- * staging file is unlinked.
+static struct wim_inode *
+wim_pathname_to_inode(WIMStruct *wim, const tchar *path)
+{
+ struct wim_dentry *dentry;
+ dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
+ if (dentry)
+ return dentry->d_inode;
+ else
+ return NULL;
+}
+
+/*
+ * Remove a dentry from a mounted WIM image; i.e. remove an alias for an inode.
*/
-static void remove_dentry(struct wim_dentry *dentry,
- struct wim_lookup_table *lookup_table)
+static void
+remove_dentry(struct wim_dentry *dentry,
+ struct wim_lookup_table *lookup_table)
{
- struct wim_inode *inode = dentry->d_inode;
- struct wim_lookup_table_entry *lte;
- unsigned i;
+ /* Put a reference to each stream the inode contains. */
+ inode_unref_streams(dentry->d_inode, lookup_table);
- for (i = 0; i <= inode->i_num_ads; i++) {
- lte = inode_stream_lte_resolved(inode, i);
- if (lte)
- lte_decrement_refcnt(lte, lookup_table);
- }
+ /* Unlink the dentry from the image's dentry tree. */
unlink_dentry(dentry);
- put_dentry(dentry);
+
+ /* Delete the dentry. This will also decrement the link count of the
+ * corresponding inode. */
+ free_dentry(dentry);
}
-static mode_t inode_default_unix_mode(const struct wim_inode *inode)
+static mode_t
+inode_unix_file_type(const struct wim_inode *inode)
{
if (inode_is_symlink(inode))
- return S_IFLNK | 0777;
+ return S_IFLNK;
else if (inode_is_directory(inode))
- return S_IFDIR | 0777;
+ return S_IFDIR;
else
- return S_IFREG | 0777;
+ return S_IFREG;
+}
+
+static mode_t
+inode_default_unix_mode(const struct wim_inode *inode)
+{
+ return inode_unix_file_type(inode) | 0777;
}
/* Transfers file attributes from a struct wim_inode to a `stat' buffer.
* The lookup table entry tells us which stream in the inode we are statting.
* For a named data stream, everything returned is the same as the unnamed data
* stream except possibly the size and block count. */
-static int inode_to_stbuf(const struct wim_inode *inode,
- const struct wim_lookup_table_entry *lte,
- struct stat *stbuf)
+static int
+inode_to_stbuf(const struct wim_inode *inode,
+ const struct wim_lookup_table_entry *lte,
+ struct stat *stbuf)
{
const struct wimfs_context *ctx = wimfs_get_context();
memset(stbuf, 0, sizeof(struct stat));
- stbuf->st_mode = inode_default_unix_mode(inode);
- stbuf->st_uid = ctx->default_uid;
- stbuf->st_gid = ctx->default_gid;
- if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
- struct wimlib_unix_data unix_data;
- if (inode_get_unix_data(inode, &unix_data, NULL) == 0) {
- stbuf->st_uid = unix_data.uid;
- stbuf->st_gid = unix_data.gid;
- stbuf->st_mode = unix_data.mode;
- }
+ if ((ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) &&
+ inode_has_unix_data(inode))
+ {
+ stbuf->st_uid = inode->i_unix_data.uid;
+ stbuf->st_gid = inode->i_unix_data.gid;
+ stbuf->st_mode = inode->i_unix_data.mode;
+ } else {
+ stbuf->st_uid = ctx->default_uid;
+ stbuf->st_gid = ctx->default_gid;
+ stbuf->st_mode = inode_default_unix_mode(inode);
}
stbuf->st_ino = (ino_t)inode->i_ino;
stbuf->st_nlink = inode->i_nlink;
- if (lte) {
- if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
- 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 = wim_resource_size(lte);
- }
- } else {
+ if (lte)
+ stbuf->st_size = lte->size;
+ else
stbuf->st_size = 0;
- }
-
+#ifdef HAVE_STAT_NANOSECOND_PRECISION
+ stbuf->st_atim = wim_timestamp_to_timespec(inode->i_last_access_time);
+ stbuf->st_mtim = wim_timestamp_to_timespec(inode->i_last_write_time);
+ stbuf->st_ctim = stbuf->st_mtim;
+#else
stbuf->st_atime = wim_timestamp_to_unix(inode->i_last_access_time);
stbuf->st_mtime = wim_timestamp_to_unix(inode->i_last_write_time);
- stbuf->st_ctime = wim_timestamp_to_unix(inode->i_creation_time);
+ stbuf->st_ctime = stbuf->st_mtime;
+#endif
stbuf->st_blocks = (stbuf->st_size + 511) / 512;
return 0;
}
+static void
+touch_inode(struct wim_inode *inode)
+{
+ u64 now = get_wim_timestamp();
+ inode->i_last_access_time = now;
+ inode->i_last_write_time = now;
+}
+
/* Creates a new staging file and returns its file descriptor opened for
* writing.
*
* On success, returns the file descriptor for the staging file, opened for
* writing. On failure, returns -1 and sets errno.
*/
-static int create_staging_file(char **name_ret, struct wimfs_context *ctx)
+static int
+create_staging_file(char **name_ret, struct wimfs_context *ctx)
{
size_t name_len;
char *name;
static const size_t STAGING_FILE_NAME_LEN = 20;
name_len = ctx->staging_dir_name_len + 1 + STAGING_FILE_NAME_LEN;
- name = MALLOC(name_len + 1);
+ name = MALLOC(name_len + 1);
if (!name) {
errno = ENOMEM;
return -1;
*
* Returns 0 on success or a negative error code on failure.
*/
-static int extract_resource_to_staging_dir(struct wim_inode *inode,
- u32 stream_id,
- struct wim_lookup_table_entry **lte,
- off_t size,
- struct wimfs_context *ctx)
+static int
+extract_resource_to_staging_dir(struct wim_inode *inode,
+ u32 stream_id,
+ struct wim_lookup_table_entry **lte,
+ off_t size,
+ struct wimfs_context *ctx)
{
char *staging_file_name;
int ret;
/* Extract the stream to the staging file (possibly truncated) */
if (old_lte) {
- extract_size = min(wim_resource_size(old_lte), size);
- ret = extract_wim_resource_to_fd(old_lte, fd, extract_size);
+ struct filedes wimlib_fd;
+ filedes_init(&wimlib_fd, fd);
+ extract_size = min(old_lte->size, size);
+ ret = extract_stream_to_fd(old_lte, &wimlib_fd, extract_size);
} else {
ret = 0;
extract_size = 0;
struct wimfs_fd *fd = inode->i_fds[i];
if (fd) {
if (fd->stream_id == stream_id) {
+ int raw_fd;
+
wimlib_assert(fd->f_lte == old_lte);
- wimlib_assert(fd->staging_fd == -1);
+ wimlib_assert(!filedes_valid(&fd->staging_fd));
fd->f_lte = new_lte;
new_lte->num_opened_fds++;
- fd->staging_fd = open(staging_file_name, O_RDONLY);
- if (fd->staging_fd == -1) {
+ raw_fd = open(staging_file_name, O_RDONLY);
+ if (raw_fd < 0) {
ret = -errno;
goto out_revert_fd_changes;
}
+ filedes_init(&fd->staging_fd, raw_fd);
}
j++;
}
}
}
- new_lte->refcnt = inode->i_nlink;
- new_lte->resource_location = RESOURCE_IN_STAGING_FILE;
- new_lte->staging_file_name = staging_file_name;
- new_lte->lte_inode = inode;
- random_hash(new_lte->hash);
+ lte_put_resource(new_lte);
+ new_lte->refcnt = inode->i_nlink;
+ new_lte->resource_location = RESOURCE_IN_STAGING_FILE;
+ new_lte->staging_file_name = staging_file_name;
+ new_lte->size = size;
- if (stream_id == 0)
- inode->i_lte = new_lte;
- else
- for (u16 i = 0; i < inode->i_num_ads; i++)
- if (inode->i_ads_entries[i].stream_id == stream_id)
- inode->i_ads_entries[i].lte = new_lte;
-
- lookup_table_insert(ctx->wim->lookup_table, new_lte);
- list_add(&new_lte->staging_list, &ctx->staging_list);
+ add_unhashed_stream(new_lte, inode, stream_id,
+ &wim_get_current_image_metadata(ctx->wim)->unhashed_streams);
+ *retrieve_lte_pointer(new_lte) = new_lte;
*lte = new_lte;
return 0;
out_revert_fd_changes:
struct wimfs_fd *fd = inode->i_fds[i];
if (fd && fd->stream_id == stream_id && fd->f_lte == new_lte) {
fd->f_lte = old_lte;
- if (fd->staging_fd != -1) {
- close(fd->staging_fd);
- fd->staging_fd = -1;
+ if (filedes_valid(&fd->staging_fd)) {
+ filedes_close(&fd->staging_fd);
+ filedes_invalidate(&fd->staging_fd);
}
j++;
}
* Creates a randomly named staging directory and saves its name in the
* filesystem context structure.
*/
-static int make_staging_dir(struct wimfs_context *ctx, const char *user_prefix)
+static int
+make_staging_dir(struct wimfs_context *ctx, const char *user_prefix)
{
static const size_t random_suffix_len = 10;
static const char *common_suffix = ".staging";
return ret;
}
-static int remove_file_or_directory(const char *fpath, const struct stat *sb,
- int typeflag, struct FTW *ftwbuf)
+static int
+remove_file_or_directory(const char *fpath, const struct stat *sb,
+ int typeflag, struct FTW *ftwbuf)
{
if (remove(fpath) == 0)
return 0;
/*
* Deletes the staging directory and all the files contained in it.
*/
-static int delete_staging_dir(struct wimfs_context *ctx)
+static int
+delete_staging_dir(struct wimfs_context *ctx)
{
int ret;
ret = nftw(ctx->staging_dir_name, remove_file_or_directory,
return ret;
}
-static void inode_update_lte_ptr(struct wim_inode *inode,
- struct wim_lookup_table_entry *old_lte,
- struct wim_lookup_table_entry *new_lte)
-{
- if (inode->i_lte == old_lte) {
- inode->i_lte = new_lte;
- } else {
- for (unsigned i = 0; i < inode->i_num_ads; i++) {
- if (inode->i_ads_entries[i].lte == old_lte) {
- inode->i_ads_entries[i].lte = new_lte;
- break;
- }
- }
- }
-}
-
-static int update_lte_of_staging_file(struct wim_lookup_table_entry *lte,
- struct wim_lookup_table *table)
-{
- struct wim_lookup_table_entry *duplicate_lte;
- int ret;
- u8 hash[SHA1_HASH_SIZE];
- struct stat stbuf;
-
- 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;
- inode_update_lte_ptr(lte->lte_inode, lte, duplicate_lte);
- 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 (stbuf.st_size == 0) {
- /* Zero-length stream. No lookup table entry needed. */
- inode_update_lte_ptr(lte->lte_inode, lte, NULL);
- free_lookup_table_entry(lte);
- } else {
- BUILD_BUG_ON(<e->file_on_disk != <e->staging_file_name);
- lte->resource_entry.original_size = stbuf.st_size;
- lte->resource_entry.size = stbuf.st_size;
- lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
- lte->file_on_disk_fp = NULL;
- copy_hash(lte->hash, hash);
- lookup_table_insert(table, lte);
- }
- }
- return 0;
-}
-
-static int inode_close_fds(struct wim_inode *inode)
+static int
+inode_close_fds(struct wim_inode *inode)
{
u16 num_opened_fds = inode->i_num_opened_fds;
for (u16 i = 0, j = 0; j < num_opened_fds; i++) {
}
/* Overwrites the WIM file, with changes saved. */
-static int rebuild_wim(struct wimfs_context *ctx, int write_flags,
- wimlib_progress_func_t progress_func)
+static int
+rebuild_wim(struct wimfs_context *ctx, int write_flags)
{
int ret;
struct wim_lookup_table_entry *lte, *tmp;
- WIMStruct *w = ctx->wim;
+ WIMStruct *wim = ctx->wim;
+ struct wim_image_metadata *imd = wim_get_current_image_metadata(ctx->wim);
DEBUG("Closing all staging file descriptors.");
- list_for_each_entry_safe(lte, tmp, &ctx->staging_list, staging_list) {
- ret = inode_close_fds(lte->lte_inode);
- if (ret != 0)
+ image_for_each_unhashed_stream_safe(lte, tmp, imd) {
+ ret = inode_close_fds(lte->back_inode);
+ if (ret)
return ret;
}
- DEBUG("Calculating SHA1 checksums for all new staging files.");
- list_for_each_entry_safe(lte, tmp, &ctx->staging_list, staging_list) {
- ret = update_lte_of_staging_file(lte, w->lookup_table);
- if (ret != 0)
- return ret;
+ DEBUG("Freeing entries for zero-length streams");
+ image_for_each_unhashed_stream_safe(lte, tmp, imd) {
+ wimlib_assert(lte->unhashed);
+ if (lte->size == 0) {
+ struct wim_lookup_table_entry **back_ptr;
+ back_ptr = retrieve_lte_pointer(lte);
+ *back_ptr = NULL;
+ list_del(<e->unhashed_list);
+ free_lookup_table_entry(lte);
+ }
}
- xml_update_image_info(w, w->current_image);
- ret = wimlib_overwrite(w, write_flags, 0, progress_func);
- if (ret != 0)
+ xml_update_image_info(wim, wim->current_image);
+ ret = wimlib_overwrite(wim, write_flags, 0);
+ if (ret)
ERROR("Failed to commit changes to mounted WIM image");
return ret;
}
-
-
/* Simple function that returns the concatenation of 2 strings. */
-static char *strcat_dup(const char *s1, const char *s2, size_t max_len)
+static char *
+strcat_dup(const char *s1, const char *s2, size_t max_len)
{
size_t len = strlen(s1) + strlen(s2);
if (len > max_len)
return p;
}
-static int set_message_queue_names(struct wimfs_context *ctx,
- const char *mount_dir)
+static int
+set_message_queue_names(struct wimfs_context *ctx, const char *mount_dir)
{
static const char *u2d_prefix = "/wimlib-unmount-to-daemon-mq";
static const char *d2u_prefix = "/wimlib-daemon-to-unmount-mq";
char *p;
int ret;
- dir_path = realpath(mount_dir, NULL);
+ dir_path = realpath(mount_dir, NULL);
if (!dir_path) {
ERROR_WITH_ERRNO("Failed to resolve path \"%s\"", mount_dir);
if (errno == ENOMEM)
return ret;
}
-static void free_message_queue_names(struct wimfs_context *ctx)
+static void
+free_message_queue_names(struct wimfs_context *ctx)
{
FREE(ctx->unmount_to_daemon_mq_name);
FREE(ctx->daemon_to_unmount_mq_name);
* @daemon specifies whether the calling process is the filesystem daemon or the
* unmount process.
*/
-static int open_message_queues(struct wimfs_context *ctx, bool daemon)
+static int
+open_message_queues(struct wimfs_context *ctx, bool daemon)
{
int unmount_to_daemon_mq_flags = O_WRONLY | O_CREAT;
int daemon_to_unmount_mq_flags = O_RDONLY | O_CREAT;
/* Try to determine the maximum message size of a message queue. The return
* value is the maximum message size, or a guess of 8192 bytes if it cannot be
* determined. */
-static long mq_get_msgsize(mqd_t mq)
+static long
+mq_get_msgsize(mqd_t mq)
{
static const char *msgsize_max_file = "/proc/sys/fs/mqueue/msgsize_max";
FILE *fp;
return msgsize;
}
-static int get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret,
- void **mailbox_ret)
+static int
+get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret,
+ void **mailbox_ret)
{
long msgsize;
- char *mailbox;
+ void *mailbox;
msgsize = mq_get_msgsize(mq);
return 0;
}
-static void unlink_message_queues(struct wimfs_context *ctx)
+static void
+unlink_message_queues(struct wimfs_context *ctx)
{
mq_unlink(ctx->unmount_to_daemon_mq_name);
mq_unlink(ctx->daemon_to_unmount_mq_name);
}
/* Closes the message queues, which are allocated in static variables */
-static void close_message_queues(struct wimfs_context *ctx)
+static void
+close_message_queues(struct wimfs_context *ctx)
{
DEBUG("Closing message queues");
mq_close(ctx->unmount_to_daemon_mq);
u32 cur_version;
u32 msg_type;
u32 msg_size;
-} PACKED;
+} _packed_attribute;
struct msg_unmount_request {
struct unmount_msg_hdr hdr;
u32 unmount_flags;
u8 want_progress_messages;
-} PACKED;
+} _packed_attribute;
struct msg_daemon_info {
struct unmount_msg_hdr hdr;
pid_t daemon_pid;
u32 mount_flags;
-} PACKED;
+} _packed_attribute;
struct msg_unmount_finished {
struct unmount_msg_hdr hdr;
- int32_t status;
-} PACKED;
+ s32 status;
+} _packed_attribute;
struct msg_write_streams_progress {
struct unmount_msg_hdr hdr;
union wimlib_progress_info info;
-} PACKED;
+} _packed_attribute;
enum {
MSG_TYPE_UNMOUNT_REQUEST,
pid_t daemon_pid;
int mount_flags;
int status;
- wimlib_progress_func_t progress_func;
+ wimlib_progress_func_t progfunc;
+ void *progctx;
};
struct daemon_msg_handler_context {
struct wimfs_context *wimfs_ctx;
};
-static int send_unmount_request_msg(mqd_t mq, int unmount_flags,
- u8 want_progress_messages)
+static int
+send_unmount_request_msg(mqd_t mq, int unmount_flags, u8 want_progress_messages)
{
DEBUG("Sending unmount request msg");
struct msg_unmount_request msg = {
.hdr = {
- .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
+ .min_version = ((unmount_flags & WIMLIB_UNMOUNT_FLAG_NEW_IMAGE) ?
+ WIMLIB_MAKEVERSION(1, 6, 2) :
+ WIMLIB_MAKEVERSION(1, 2, 1)),
.cur_version = WIMLIB_VERSION_CODE,
.msg_type = MSG_TYPE_UNMOUNT_REQUEST,
.msg_size = sizeof(msg),
return 0;
}
-static int send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
+static int
+send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
{
DEBUG("Sending daemon info msg (pid = %d, mount_flags=%x)",
pid, mount_flags);
return 0;
}
-static void send_unmount_finished_msg(mqd_t mq, int status)
+static void
+send_unmount_finished_msg(mqd_t mq, int status)
{
DEBUG("Sending unmount finished msg");
struct msg_unmount_finished msg = {
ERROR_WITH_ERRNO("Failed to send status to unmount process");
}
-static int unmount_progress_func(enum wimlib_progress_msg msg,
- const union wimlib_progress_info *info)
+static enum wimlib_progress_status
+unmount_progress_func(enum wimlib_progress_msg msg,
+ union wimlib_progress_info *info, void *_ignored_context)
{
if (msg == WIMLIB_PROGRESS_MSG_WRITE_STREAMS) {
struct msg_write_streams_progress msg = {
"to unmount process");
}
}
+ return WIMLIB_PROGRESS_STATUS_CONTINUE;
+}
+
+static void
+release_extra_refcnts(struct wimfs_context *ctx)
+{
+ struct list_head *list = &ctx->orig_stream_list;
+ struct wim_lookup_table *lookup_table = ctx->wim->lookup_table;
+ struct wim_lookup_table_entry *lte, *tmp;
+
+ list_for_each_entry_safe(lte, tmp, list, orig_stream_list) {
+ u32 n = lte->out_refcnt;
+ while (n--)
+ lte_decrement_refcnt(lte, lookup_table);
+ }
+}
+
+/* Moves the currently selected image, which may have been modified, to a new
+ * index, and sets the original index to refer to a reset (unmodified) copy of
+ * the image. */
+static int
+renew_current_image(struct wimfs_context *ctx)
+{
+ WIMStruct *wim = ctx->wim;
+ int ret;
+ int idx = wim->current_image - 1;
+ struct wim_image_metadata *imd = wim->image_metadata[idx];
+ struct wim_image_metadata *replace_imd;
+ struct wim_lookup_table_entry *new_lte;
+
+ if (imd->metadata_lte->resource_location != RESOURCE_IN_WIM) {
+ ERROR("Can't reset modified image that doesn't yet "
+ "exist in the on-disk WIM file!");
+ return WIMLIB_ERR_METADATA_NOT_FOUND;
+ }
+
+ /* Create 'replace_imd' structure to use for the reset original,
+ * unmodified image. */
+ replace_imd = new_image_metadata();
+ if (!replace_imd)
+ return WIMLIB_ERR_NOMEM;
+
+ /* Create new stream reference for the modified image's metadata
+ * resource, which doesn't exist yet. */
+ ret = WIMLIB_ERR_NOMEM;
+ new_lte = new_lookup_table_entry();
+ if (!new_lte)
+ goto err_put_replace_imd;
+ new_lte->flags = WIM_RESHDR_FLAG_METADATA;
+ new_lte->unhashed = 1;
+
+ /* Make the image being moved available at a new index. Increments the
+ * WIM's image count, but does not increment the reference count of the
+ * 'struct image_metadata'. */
+ ret = append_image_metadata(wim, imd);
+ if (ret)
+ goto err_free_new_lte;
+
+ ret = xml_add_image(wim, T(""));
+ if (ret)
+ goto err_undo_append;
+
+ replace_imd->metadata_lte = imd->metadata_lte;
+ imd->metadata_lte = new_lte;
+ wim->image_metadata[idx] = replace_imd;
+ wim->current_image = wim->hdr.image_count;
return 0;
+
+err_undo_append:
+ wim->hdr.image_count--;
+err_free_new_lte:
+ free_lookup_table_entry(new_lte);
+err_put_replace_imd:
+ put_image_metadata(replace_imd, NULL);
+ return ret;
}
-static int msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
+static int
+msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
{
const struct msg_unmount_request *msg = _msg;
struct daemon_msg_handler_context *handler_ctx = _handler_ctx;
int status = 0;
int ret;
int unmount_flags;
- wimlib_progress_func_t progress_func;
DEBUG("Handling unmount request msg");
}
unmount_flags = msg->unmount_flags;
- if (msg->want_progress_messages)
- progress_func = unmount_progress_func;
- else
- progress_func = NULL;
+
+ wimlib_register_progress_function(wimfs_ctx->wim,
+ (msg->want_progress_messages ?
+ unmount_progress_func : NULL),
+ NULL);
ret = send_daemon_info_msg(wimfs_ctx->daemon_to_unmount_mq, getpid(),
wimfs_ctx->mount_flags);
if (wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
if (unmount_flags & WIMLIB_UNMOUNT_FLAG_COMMIT) {
+
+ if (unmount_flags & WIMLIB_UNMOUNT_FLAG_NEW_IMAGE) {
+ ret = renew_current_image(wimfs_ctx);
+ if (ret) {
+ status = ret;
+ goto out;
+ }
+ } else {
+ release_extra_refcnts(wimfs_ctx);
+ }
+ INIT_LIST_HEAD(&wimfs_ctx->orig_stream_list);
+
int write_flags = 0;
if (unmount_flags & WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY)
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
write_flags |= WIMLIB_WRITE_FLAG_REBUILD;
if (unmount_flags & WIMLIB_UNMOUNT_FLAG_RECOMPRESS)
write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
- status = rebuild_wim(wimfs_ctx, write_flags,
- progress_func);
+ status = rebuild_wim(wimfs_ctx, write_flags);
}
} else {
DEBUG("Read-only mount");
return MSG_BREAK_LOOP;
}
-static int msg_daemon_info_handler(const void *_msg, void *_handler_ctx)
+static int
+msg_daemon_info_handler(const void *_msg, void *_handler_ctx)
{
const struct msg_daemon_info *msg = _msg;
struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
return 0;
}
-static int msg_write_streams_progress_handler(const void *_msg,
- void *_handler_ctx)
+static int
+msg_write_streams_progress_handler(const void *_msg, void *_handler_ctx)
{
const struct msg_write_streams_progress *msg = _msg;
struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
if (msg->hdr.msg_size < sizeof(*msg))
return WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE;
- if (handler_ctx->progress_func) {
- handler_ctx->progress_func(WIMLIB_PROGRESS_MSG_WRITE_STREAMS,
- &msg->info);
- }
- return 0;
+ return call_progress(handler_ctx->progfunc,
+ WIMLIB_PROGRESS_MSG_WRITE_STREAMS,
+ (union wimlib_progress_info *)&msg->info,
+ handler_ctx->progctx);
}
-static int msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
+static int
+msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
{
const struct msg_unmount_finished *msg = _msg;
struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
return MSG_BREAK_LOOP;
}
-static int unmount_timed_out_cb(void *_handler_ctx)
+static int
+unmount_timed_out_cb(void *_handler_ctx)
{
- struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
+ const struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
- if (handler_ctx->daemon_pid == 0) {
- goto out_crashed;
- } else {
- kill(handler_ctx->daemon_pid, 0);
- if (errno == ESRCH) {
- goto out_crashed;
- } else {
- DEBUG("Filesystem daemon is still alive... "
- "Waiting another %d seconds\n",
- handler_ctx->hdr.timeout_seconds);
- return 0;
- }
+ if (handler_ctx->daemon_pid == 0 ||
+ (kill(handler_ctx->daemon_pid, 0) != 0 && errno == ESRCH))
+ {
+ ERROR("The filesystem daemon has crashed! Changes to the "
+ "WIM may not have been commited.");
+ return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
}
-out_crashed:
- ERROR("The filesystem daemon has crashed! Changes to the "
- "WIM may not have been commited.");
- return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
+
+ DEBUG("Filesystem daemon is still alive... "
+ "Waiting another %d seconds", handler_ctx->hdr.timeout_seconds);
+ return 0;
}
-static int daemon_timed_out_cb(void *_handler_ctx)
+static int
+daemon_timed_out_cb(void *_handler_ctx)
{
ERROR("Timed out waiting for unmount request! "
"Changes to the mounted WIM will not be committed.");
},
};
-static int receive_message(mqd_t mq,
- struct msg_handler_context_hdr *handler_ctx,
- const msg_handler_t msg_handlers[],
- long mailbox_size, void *mailbox)
+static int
+receive_message(mqd_t mq,
+ struct msg_handler_context_hdr *handler_ctx,
+ const msg_handler_t msg_handlers[],
+ long mailbox_size, void *mailbox)
{
struct timeval now;
struct timespec timeout;
return ret;
}
-static int message_loop(mqd_t mq,
- const struct msg_handler_callbacks *callbacks,
- struct msg_handler_context_hdr *handler_ctx)
+static int
+message_loop(mqd_t mq,
+ const struct msg_handler_callbacks *callbacks,
+ struct msg_handler_context_hdr *handler_ctx)
{
static const size_t MAX_MSG_SIZE = 512;
long msgsize;
* not. However, after that, the unmount process must wait for the filesystem
* daemon to finish writing the WIM file.
*/
-static int execute_fusermount(const char *dir)
+static int
+execute_fusermount(const char *dir, bool lazy)
{
pid_t pid;
int ret;
}
if (pid == 0) {
/* Child */
- execlp("fusermount", "fusermount", "-u", dir, NULL);
+ char *argv[10];
+ char **argp = argv;
+ *argp++ = "fusermount";
+ if (lazy)
+ *argp++ = "-z";
+ *argp++ = "-u";
+ *argp++ = (char*)dir;
+ *argp = NULL;
+ execvp("fusermount", argv);
ERROR_WITH_ERRNO("Failed to execute `fusermount'");
exit(WIMLIB_ERR_FUSERMOUNT);
}
}
if (pid == 0) {
/* Child */
- execlp("umount", "umount", dir, NULL);
+ char *argv[10];
+ char **argp = argv;
+ *argp++ = "umount";
+ if (lazy)
+ *argp++ = "-l";
+ *argp++ = (char*)dir;
+ *argp = NULL;
+ execvp("umount", argv);
ERROR_WITH_ERRNO("Failed to execute `umount'");
exit(WIMLIB_ERR_FUSERMOUNT);
}
"terminate");
return WIMLIB_ERR_FUSERMOUNT;
}
- if (status != 0) {
+
+ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
ERROR("`umount' did not successfully complete");
return WIMLIB_ERR_FUSERMOUNT;
}
- return 0;
-}
-#if 0
-static int wimfs_access(const char *path, int mask)
-{
- return -ENOSYS;
+ return 0;
}
-#endif
-static int wimfs_chmod(const char *path, mode_t mask)
+static int
+wimfs_chmod(const char *path, mode_t mask)
{
struct wim_dentry *dentry;
+ struct wim_inode *inode;
struct wimfs_context *ctx = wimfs_get_context();
int ret;
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
return -EPERM;
- ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
- &dentry, NULL, NULL);
+ ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
+ &dentry, NULL, NULL);
if (ret)
return ret;
- ret = inode_set_unix_data(dentry->d_inode, ctx->default_uid,
- ctx->default_gid, mask,
- ctx->wim->lookup_table, UNIX_DATA_MODE);
- return ret ? -ENOMEM : 0;
+ inode = dentry->d_inode;
+
+ if (!inode_has_unix_data(inode)) {
+ inode->i_unix_data.uid = ctx->default_uid;
+ inode->i_unix_data.gid = ctx->default_gid;
+ }
+ inode->i_unix_data.mode = mask;
+ return 0;
}
-static int wimfs_chown(const char *path, uid_t uid, gid_t gid)
+static int
+wimfs_chown(const char *path, uid_t uid, gid_t gid)
{
struct wim_dentry *dentry;
+ struct wim_inode *inode;
struct wimfs_context *ctx = wimfs_get_context();
int ret;
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
return -EPERM;
- ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
- &dentry, NULL, NULL);
+ ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
+ &dentry, NULL, NULL);
if (ret)
return ret;
- ret = inode_set_unix_data(dentry->d_inode, uid, gid,
- inode_default_unix_mode(dentry->d_inode),
- ctx->wim->lookup_table,
- UNIX_DATA_UID | UNIX_DATA_GID);
- return ret ? -ENOMEM : 0;
+ inode = dentry->d_inode;
+
+ if (!inode_has_unix_data(inode))
+ inode->i_unix_data.mode = inode_default_unix_mode(inode);
+ inode->i_unix_data.uid = uid;
+ inode->i_unix_data.gid = gid;
+ return 0;
}
/* Called when the filesystem is unmounted. */
-static void wimfs_destroy(void *p)
+static void
+wimfs_destroy(void *p)
{
struct wimfs_context *wimfs_ctx = wimfs_get_context();
if (open_message_queues(wimfs_ctx, true) == 0) {
}
}
-#if 0
-static int wimfs_fallocate(const char *path, int mode,
- off_t offset, off_t len, struct fuse_file_info *fi)
-{
- struct wimfs_fd *fd = (struct wimfs_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)
+static int
+wimfs_fgetattr(const char *path, struct stat *stbuf,
+ struct fuse_file_info *fi)
{
struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
return inode_to_stbuf(fd->f_inode, fd->f_lte, stbuf);
}
-static int wimfs_ftruncate(const char *path, off_t size,
- struct fuse_file_info *fi)
+static int
+wimfs_ftruncate(const char *path, off_t size, struct fuse_file_info *fi)
{
struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
- int ret = ftruncate(fd->staging_fd, size);
- if (ret != 0)
+ int ret = ftruncate(fd->staging_fd.fd, size);
+ if (ret)
return -errno;
- if (fd->f_lte && size < fd->f_lte->resource_entry.original_size)
- fd->f_lte->resource_entry.original_size = size;
+ touch_inode(fd->f_inode);
+ fd->f_lte->size = size;
return 0;
}
/*
* Fills in a `struct stat' that corresponds to a file or directory in the WIM.
*/
-static int wimfs_getattr(const char *path, struct stat *stbuf)
+static int
+wimfs_getattr(const char *path, struct stat *stbuf)
{
struct wim_dentry *dentry;
struct wim_lookup_table_entry *lte;
int ret;
struct wimfs_context *ctx = wimfs_get_context();
- ret = lookup_resource(ctx->wim, path,
- get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK,
- &dentry, <e, NULL);
+ ret = wim_pathname_to_stream(ctx->wim, path,
+ get_lookup_flags(ctx) |
+ 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)
+static int
+wimfs_getxattr(const char *path, const char *name, char *value,
+ size_t size)
{
int ret;
struct wim_inode *inode;
struct wim_ads_entry *ads_entry;
- size_t res_size;
+ u64 stream_size;
struct wim_lookup_table_entry *lte;
struct wimfs_context *ctx = wimfs_get_context();
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOTSUP;
- if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+ if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0)
return -ENOATTR;
name += 5;
return -ENOATTR;
lte = ads_entry->lte;
- res_size = wim_resource_size(lte);
+ stream_size = lte->size;
if (size == 0)
- return res_size;
+ return stream_size;
- if (res_size > size)
+ if (stream_size > size)
return -ERANGE;
- ret = read_full_wim_resource(lte, (u8*)value,
- WIMLIB_RESOURCE_FLAG_MULTITHREADED);
- if (ret != 0)
- return -EIO;
-
- return res_size;
+ ret = read_full_stream_into_buf(lte, value);
+ if (ret) {
+ if (errno)
+ return -errno;
+ else
+ return -EIO;
+ }
+ return stream_size;
}
#endif
/* Create a hard link */
-static int wimfs_link(const char *to, const char *from)
+static int
+wimfs_link(const char *to, const char *from)
{
struct wim_dentry *from_dentry, *from_dentry_parent;
const char *link_name;
struct wim_inode *inode;
- struct wim_lookup_table_entry *lte;
- WIMStruct *w = wimfs_get_WIMStruct();
- u16 i;
+ WIMStruct *wim = wimfs_get_WIMStruct();
+ int ret;
- inode = wim_pathname_to_inode(w, to);
+ inode = wim_pathname_to_inode(wim, to);
if (!inode)
return -errno;
FILE_ATTRIBUTE_REPARSE_POINT))
return -EPERM;
- from_dentry_parent = get_parent_dentry(w, from);
+ from_dentry_parent = get_parent_dentry(wim, from, WIMLIB_CASE_SENSITIVE);
if (!from_dentry_parent)
return -errno;
if (!dentry_is_directory(from_dentry_parent))
return -ENOTDIR;
link_name = path_basename(from);
- if (get_dentry_child_with_name(from_dentry_parent, link_name))
+ if (get_dentry_child_with_name(from_dentry_parent, link_name,
+ WIMLIB_CASE_SENSITIVE))
return -EEXIST;
- from_dentry = new_dentry(link_name);
- if (!from_dentry)
- return -errno;
- inode_add_dentry(from_dentry, inode);
- from_dentry->d_inode = inode;
- inode->i_nlink++;
+ ret = new_dentry(link_name, &from_dentry);
+ if (ret)
+ return -ENOMEM;
- for (i = 0; i <= inode->i_num_ads; i++) {
- lte = inode_stream_lte_resolved(inode, i);
- if (lte)
- lte->refcnt++;
- }
+ inode->i_nlink++;
+ inode_ref_streams(inode);
+ from_dentry->d_inode = inode;
+ inode_add_dentry(from_dentry, inode);
dentry_add_child(from_dentry_parent, from_dentry);
return 0;
}
#ifdef ENABLE_XATTR
-static int wimfs_listxattr(const char *path, char *list, size_t size)
+static int
+wimfs_listxattr(const char *path, char *list, size_t size)
{
size_t needed_size;
struct wim_inode *inode;
struct wimfs_context *ctx = wimfs_get_context();
u16 i;
char *p;
+ bool size_only = (size == 0);
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOTSUP;
if (!inode)
return -errno;
- if (size == 0) {
- needed_size = 0;
- for (i = 0; i < inode->i_num_ads; i++)
- needed_size += inode->i_ads_entries[i].stream_name_utf8_len + 6;
- return needed_size;
- } else {
- p = list;
- for (i = 0; i < inode->i_num_ads; i++) {
- needed_size = inode->i_ads_entries[i].stream_name_utf8_len + 6;
- if (needed_size > size)
+ p = list;
+ for (i = 0; i < inode->i_num_ads; i++) {
+
+ if (!ads_entry_is_named_stream(&inode->i_ads_entries[i]))
+ continue;
+
+ char *stream_name_mbs;
+ size_t stream_name_mbs_nbytes;
+ int ret;
+
+ ret = utf16le_to_tstr(inode->i_ads_entries[i].stream_name,
+ inode->i_ads_entries[i].stream_name_nbytes,
+ &stream_name_mbs,
+ &stream_name_mbs_nbytes);
+ if (ret)
+ return -errno;
+
+ needed_size = stream_name_mbs_nbytes + 6;
+ if (!size_only) {
+ if (needed_size > size) {
+ FREE(stream_name_mbs);
return -ERANGE;
- p += sprintf(p, "user.%s",
- inode->i_ads_entries[i].stream_name_utf8) + 1;
+ }
+ sprintf(p, "user.%s", stream_name_mbs);
size -= needed_size;
}
- return p - list;
+ p += needed_size;
+ FREE(stream_name_mbs);
}
+ return p - list;
}
#endif
/* Create a directory in the WIM image. */
-static int wimfs_mkdir(const char *path, mode_t mode)
+static int
+wimfs_mkdir(const char *path, mode_t mode)
{
return create_dentry(fuse_get_context(), path, mode | S_IFDIR,
FILE_ATTRIBUTE_DIRECTORY, NULL);
}
/* Create a regular file or alternate data stream in the WIM image. */
-static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
+static int
+wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
{
const char *stream_name;
struct fuse_context *fuse_ctx = fuse_get_context();
inode = wim_pathname_to_inode(wimfs_ctx->wim, path);
if (!inode)
return -errno;
- if (inode->i_attributes &
- (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
+ if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)
return -ENOENT;
if (inode_get_ads_entry(inode, stream_name, NULL))
return -EEXIST;
}
}
-
/* Open a file. */
-static int wimfs_open(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_open(const char *path, struct fuse_file_info *fi)
{
struct wim_dentry *dentry;
struct wim_lookup_table_entry *lte;
u16 stream_idx;
u32 stream_id;
struct wimfs_context *ctx = wimfs_get_context();
+ struct wim_lookup_table_entry **back_ptr;
- ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
- &dentry, <e, &stream_idx);
- if (ret != 0)
+ ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+ &dentry, <e, &stream_idx);
+ if (ret)
return ret;
inode = dentry->d_inode;
- if (stream_idx == 0)
+ if (stream_idx == 0) {
stream_id = 0;
- else
+ back_ptr = &inode->i_lte;
+ } else {
stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
+ back_ptr = &inode->i_ads_entries[stream_idx - 1].lte;
+ }
/* 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
if (flags_writable(fi->flags) &&
(!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE)) {
- u64 size = (lte) ? wim_resource_size(lte) : 0;
+ u64 size = (lte) ? lte->size : 0;
ret = extract_resource_to_staging_dir(inode, stream_id,
<e, size, ctx);
- if (ret != 0)
+ if (ret)
return ret;
+ *back_ptr = lte;
}
- ret = alloc_wimfs_fd(inode, stream_id, lte, &fd,
- wimfs_ctx_readonly(ctx));
- if (ret != 0)
+ ret = alloc_wimfs_fd(inode, stream_id, lte, &fd);
+ if (ret)
return ret;
if (lte && lte->resource_location == RESOURCE_IN_STAGING_FILE) {
- fd->staging_fd = open(lte->staging_file_name, fi->flags);
- if (fd->staging_fd == -1) {
+ int raw_fd;
+
+ raw_fd = open(lte->staging_file_name, fi->flags);
+ if (raw_fd < 0) {
int errno_save = errno;
close_wimfs_fd(fd);
return -errno_save;
}
+ filedes_init(&fd->staging_fd, raw_fd);
}
fi->fh = (uintptr_t)fd;
return 0;
}
/* Opens a directory. */
-static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_opendir(const char *path, struct fuse_file_info *fi)
{
struct wim_inode *inode;
int ret;
struct wimfs_fd *fd = NULL;
struct wimfs_context *ctx = wimfs_get_context();
- WIMStruct *w = ctx->wim;
+ WIMStruct *wim = ctx->wim;
- inode = wim_pathname_to_inode(w, path);
+ inode = wim_pathname_to_inode(wim, path);
if (!inode)
return -errno;
if (!inode_is_directory(inode))
return -ENOTDIR;
- ret = alloc_wimfs_fd(inode, 0, NULL, &fd, wimfs_ctx_readonly(ctx));
+ ret = alloc_wimfs_fd(inode, 0, NULL, &fd);
fi->fh = (uintptr_t)fd;
return ret;
}
/*
* Read data from a file in the WIM or in the staging directory.
*/
-static int wimfs_read(const char *path, char *buf, size_t size,
- off_t offset, struct fuse_file_info *fi)
+static int
+wimfs_read(const char *path, char *buf, size_t size,
+ off_t offset, struct fuse_file_info *fi)
{
struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
ssize_t ret;
+ u64 stream_size;
if (!fd)
return -EBADF;
- if (!fd->f_lte) /* Empty stream with no lookup table entry */
+ if (size == 0)
return 0;
- if (fd->f_lte->resource_location == RESOURCE_IN_STAGING_FILE) {
- /* Read from staging file */
+ if (fd->f_lte)
+ stream_size = fd->f_lte->size;
+ else
+ stream_size = 0;
- wimlib_assert(fd->f_lte->staging_file_name);
- wimlib_assert(fd->staging_fd != -1);
+ if (offset > stream_size)
+ return -EOVERFLOW;
- DEBUG("Seek to offset %"PRIu64, offset);
+ size = min(size, stream_size - offset);
+ if (size == 0)
+ return 0;
- if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
- return -errno;
- ret = read(fd->staging_fd, buf, size);
+ switch (fd->f_lte->resource_location) {
+ case RESOURCE_IN_STAGING_FILE:
+ ret = raw_pread(&fd->staging_fd, buf, size, offset);
if (ret == -1)
- return -errno;
- return ret;
- } else {
- /* Read from WIM */
- u64 res_size = wim_resource_size(fd->f_lte);
- if (offset > res_size)
- return -EOVERFLOW;
- size = min(size, res_size - offset);
- if (read_wim_resource(fd->f_lte, (u8*)buf,
- size, offset,
- WIMLIB_RESOURCE_FLAG_MULTITHREADED) != 0)
- return -EIO;
- return size;
+ ret = -errno;
+ break;
+ case RESOURCE_IN_WIM:
+ if (read_partial_wim_stream_into_buf(fd->f_lte, size,
+ offset, buf))
+ ret = errno ? -errno : -EIO;
+ else
+ ret = size;
+ break;
+ case RESOURCE_IN_ATTACHED_BUFFER:
+ memcpy(buf, fd->f_lte->attached_buffer + offset, size);
+ ret = size;
+ break;
+ default:
+ ERROR("Invalid resource location");
+ ret = -EIO;
+ break;
}
-}
-
-struct fill_params {
- void *buf;
- fuse_fill_dir_t filler;
-};
-
-static int dentry_fuse_fill(struct wim_dentry *dentry, void *arg)
-{
- struct fill_params *fill_params = arg;
- return fill_params->filler(fill_params->buf, dentry->file_name_utf8,
- NULL, 0);
+ return ret;
}
/* 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)
+static int
+wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+ off_t offset, struct fuse_file_info *fi)
{
struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
struct wim_inode *inode;
+ struct wim_dentry *child;
+ int ret;
if (!fd)
return -EBADF;
inode = fd->f_inode;
- struct fill_params fill_params = {
- .buf = buf,
- .filler = filler,
- };
+ ret = filler(buf, ".", NULL, 0);
+ if (ret)
+ return ret;
+ ret = filler(buf, "..", NULL, 0);
+ if (ret)
+ return ret;
+
+ for_inode_child(child, inode) {
+ char *file_name_mbs;
+ size_t file_name_mbs_nbytes;
- filler(buf, ".", NULL, 0);
- filler(buf, "..", NULL, 0);
+ ret = utf16le_to_tstr(child->file_name,
+ child->file_name_nbytes,
+ &file_name_mbs,
+ &file_name_mbs_nbytes);
+ if (ret)
+ return -errno;
- return for_dentry_in_rbtree(inode->i_children.rb_node,
- dentry_fuse_fill, &fill_params);
+ ret = filler(buf, file_name_mbs, NULL, 0);
+ FREE(file_name_mbs);
+ if (ret)
+ return ret;
+ }
+ return 0;
}
-static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
+static int
+wimfs_readlink(const char *path, char *buf, size_t buf_len)
{
struct wimfs_context *ctx = wimfs_get_context();
struct wim_inode *inode = wim_pathname_to_inode(ctx->wim, path);
return -errno;
if (!inode_is_symlink(inode))
return -EINVAL;
-
- ret = inode_readlink(inode, buf, buf_len, ctx->wim,
- WIMLIB_RESOURCE_FLAG_MULTITHREADED);
- if (ret > 0)
+ if (buf_len == 0)
+ return -EINVAL;
+ ret = wim_inode_readlink(inode, buf, buf_len - 1, NULL);
+ if (ret >= 0) {
+ wimlib_assert(ret <= buf_len - 1);
+ buf[ret] = '\0';
ret = 0;
+ } else if (ret == -ENAMETOOLONG) {
+ buf[buf_len - 1] = '\0';
+ }
return ret;
}
/* Close a file. */
-static int wimfs_release(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_release(const char *path, struct fuse_file_info *fi)
{
struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
return close_wimfs_fd(fd);
}
/* Close a directory */
-static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_releasedir(const char *path, struct fuse_file_info *fi)
{
struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
return close_wimfs_fd(fd);
#ifdef ENABLE_XATTR
/* Remove an alternate data stream through the XATTR interface */
-static int wimfs_removexattr(const char *path, const char *name)
+static int
+wimfs_removexattr(const char *path, const char *name)
{
struct wim_inode *inode;
struct wim_ads_entry *ads_entry;
#endif
/* Renames a file or directory. See rename (3) */
-static int wimfs_rename(const char *from, const char *to)
+static int
+wimfs_rename(const char *from, const char *to)
{
- struct wim_dentry *src;
- struct wim_dentry *dst;
- struct wim_dentry *parent_of_dst;
- WIMStruct *w = wimfs_get_WIMStruct();
- int ret;
-
- /* This rename() implementation currently only supports actual files
- * (not alternate data streams) */
-
- src = get_dentry(w, from);
- if (!src)
- return -errno;
-
- dst = get_dentry(w, to);
-
- 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))
- return -EISDIR;
- } else {
- /* Cannot rename directory to a non-directory or a non-empty
- * directory */
- if (!dentry_is_directory(dst))
- return -ENOTDIR;
- if (inode_has_children(dst->d_inode))
- return -ENOTEMPTY;
- }
- parent_of_dst = dst->parent;
- } else {
- /* Destination does not exist */
- parent_of_dst = get_parent_dentry(w, to);
- if (!parent_of_dst)
- return -errno;
-
- if (!dentry_is_directory(parent_of_dst))
- return -ENOTDIR;
- }
-
- ret = set_dentry_name(src, path_basename(to));
- if (ret != 0)
- return -ENOMEM;
- if (dst)
- remove_dentry(dst, w->lookup_table);
- unlink_dentry(src);
- dentry_add_child(parent_of_dst, src);
- return 0;
+ return rename_wim_path(wimfs_get_WIMStruct(), from, to,
+ WIMLIB_CASE_SENSITIVE, NULL);
}
/* Remove a directory */
-static int wimfs_rmdir(const char *path)
+static int
+wimfs_rmdir(const char *path)
{
struct wim_dentry *dentry;
- WIMStruct *w = wimfs_get_WIMStruct();
+ WIMStruct *wim = wimfs_get_WIMStruct();
- dentry = get_dentry(w, path);
+ dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
if (!dentry)
return -errno;
if (dentry_has_children(dentry))
return -ENOTEMPTY;
- remove_dentry(dentry, w->lookup_table);
+ remove_dentry(dentry, wim->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)
+static int
+wimfs_setxattr(const char *path, const char *name,
+ const char *value, size_t size, int flags)
{
struct wim_ads_entry *existing_ads_entry;
struct wim_inode *inode;
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOTSUP;
- if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+ if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0)
return -ENOATTR;
name += 5;
if (existing_ads_entry) {
if (flags & XATTR_CREATE)
return -EEXIST;
- inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table);
} else {
if (flags & XATTR_REPLACE)
return -ENOATTR;
}
- ret = inode_add_ads_with_data(inode, name, (const u8*)value,
+ ret = inode_add_ads_with_data(inode, name, value,
size, ctx->wim->lookup_table);
- return ret ? -ENOMEM : 0;
+ if (ret == 0) {
+ if (existing_ads_entry)
+ inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table);
+ } else {
+ ret = -ENOMEM;
+ }
+ return ret;
}
#endif
-static int wimfs_symlink(const char *to, const char *from)
+static int
+wimfs_symlink(const char *to, const char *from)
{
struct fuse_context *fuse_ctx = fuse_get_context();
struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
FILE_ATTRIBUTE_REPARSE_POINT, &dentry);
if (ret == 0) {
dentry->d_inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
- if (inode_set_symlink(dentry->d_inode, to,
- wimfs_ctx->wim->lookup_table, NULL))
- {
+ ret = wim_inode_set_symlink(dentry->d_inode, to,
+ wimfs_ctx->wim->lookup_table);
+ if (ret) {
remove_dentry(dentry, wimfs_ctx->wim->lookup_table);
- ret = -ENOMEM;
+ if (ret == WIMLIB_ERR_NOMEM)
+ ret = -ENOMEM;
+ else
+ ret = -EIO;
}
}
return ret;
/* Reduce the size of a file */
-static int wimfs_truncate(const char *path, off_t size)
+static int
+wimfs_truncate(const char *path, off_t size)
{
struct wim_dentry *dentry;
struct wim_lookup_table_entry *lte;
struct wim_inode *inode;
struct wimfs_context *ctx = wimfs_get_context();
- ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
- &dentry, <e, &stream_idx);
+ ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+ &dentry, <e, &stream_idx);
if (ret != 0)
return ret;
if (lte == NULL && size == 0)
return 0;
- inode = dentry->d_inode;
- if (stream_idx == 0)
- stream_id = 0;
- else
- stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
-
- if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ if (lte != NULL && lte->resource_location == RESOURCE_IN_STAGING_FILE) {
ret = truncate(lte->staging_file_name, size);
- if (ret != 0)
+ if (ret)
ret = -errno;
+ else
+ lte->size = size;
} else {
/* File in WIM. Extract it to the staging directory, but only
* the first @size bytes of it. */
+ struct wim_lookup_table_entry **back_ptr;
+
+ inode = dentry->d_inode;
+ if (stream_idx == 0) {
+ stream_id = 0;
+ back_ptr = &inode->i_lte;
+ } else {
+ stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
+ back_ptr = &inode->i_ads_entries[stream_idx - 1].lte;
+ }
ret = extract_resource_to_staging_dir(inode, stream_id,
<e, size, ctx);
+ *back_ptr = lte;
}
return ret;
}
/* Unlink a non-directory or alternate data stream */
-static int wimfs_unlink(const char *path)
+static int
+wimfs_unlink(const char *path)
{
struct wim_dentry *dentry;
struct wim_lookup_table_entry *lte;
u16 stream_idx;
struct wimfs_context *ctx = wimfs_get_context();
- ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
- &dentry, <e, &stream_idx);
+ ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+ &dentry, <e, &stream_idx);
if (ret != 0)
return ret;
- if (stream_idx == 0)
+ if (inode_stream_name_nbytes(dentry->d_inode, stream_idx) == 0)
remove_dentry(dentry, ctx->wim->lookup_table);
else
inode_remove_ads(dentry->d_inode, stream_idx - 1,
*
* Note that alternate data streams do not have their own timestamps.
*/
-static int wimfs_utimens(const char *path, const struct timespec tv[2])
+static int
+wimfs_utimens(const char *path, const struct timespec tv[2])
{
- struct wim_dentry *dentry;
struct wim_inode *inode;
- WIMStruct *w = wimfs_get_WIMStruct();
+ WIMStruct *wim = wimfs_get_WIMStruct();
- dentry = get_dentry(w, path);
- if (!dentry)
+ inode = wim_pathname_to_inode(wim, path);
+ if (!inode)
return -errno;
- inode = dentry->d_inode;
if (tv[0].tv_nsec != UTIME_OMIT) {
if (tv[0].tv_nsec == UTIME_NOW)
inode->i_last_access_time = get_wim_timestamp();
else
- inode->i_last_access_time = timespec_to_wim_timestamp(&tv[0]);
+ inode->i_last_access_time = timespec_to_wim_timestamp(tv[0]);
}
if (tv[1].tv_nsec != UTIME_OMIT) {
if (tv[1].tv_nsec == UTIME_NOW)
inode->i_last_write_time = get_wim_timestamp();
else
- inode->i_last_write_time = timespec_to_wim_timestamp(&tv[1]);
+ inode->i_last_write_time = timespec_to_wim_timestamp(tv[1]);
}
return 0;
}
-#else
-static int wimfs_utime(const char *path, struct utimbuf *times)
+#else /* HAVE_UTIMENSAT */
+static int
+wimfs_utime(const char *path, struct utimbuf *times)
{
- struct wim_dentry *dentry;
struct wim_inode *inode;
- WIMStruct *w = wimfs_get_WIMStruct();
+ WIMStruct *wim = wimfs_get_WIMStruct();
- dentry = get_dentry(w, path);
- if (!dentry)
+ inode = wim_pathname_to_inode(wim, path);
+ if (!inode)
return -errno;
- inode = dentry->d_inode;
inode->i_last_write_time = unix_timestamp_to_wim(times->modtime);
inode->i_last_access_time = unix_timestamp_to_wim(times->actime);
return 0;
}
-#endif
+#endif /* !HAVE_UTIMENSAT */
/* Writes to a file in the WIM filesystem.
* It may be an alternate data stream, but here we don't even notice because we
* just get a lookup table entry. */
-static int wimfs_write(const char *path, const char *buf, size_t size,
- off_t offset, struct fuse_file_info *fi)
+static int
+wimfs_write(const char *path, const char *buf, size_t size,
+ off_t offset, struct fuse_file_info *fi)
{
struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
int ret;
- u64 now;
if (!fd)
return -EBADF;
- wimlib_assert(fd->f_lte);
- wimlib_assert(fd->f_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;
+ wimlib_assert(fd->f_lte != NULL);
+ wimlib_assert(fd->f_lte->staging_file_name != NULL);
+ wimlib_assert(filedes_valid(&fd->staging_fd));
+ wimlib_assert(fd->f_inode != NULL);
/* Write the data. */
- ret = write(fd->staging_fd, buf, size);
+ ret = raw_pwrite(&fd->staging_fd, buf, size, offset);
if (ret == -1)
return -errno;
- now = get_wim_timestamp();
- fd->f_inode->i_last_write_time = now;
- fd->f_inode->i_last_access_time = now;
+ /* Update file size */
+ if (offset + size > fd->f_lte->size) {
+ DEBUG("Update file size %"PRIu64 " => %"PRIu64"",
+ fd->f_lte->size, offset + size);
+ fd->f_lte->size = offset + size;
+ }
+
+ /* Update timestamps */
+ touch_inode(fd->f_inode);
return ret;
}
static struct fuse_operations wimfs_operations = {
-#if 0
- .access = wimfs_access,
-#endif
.chmod = wimfs_chmod,
.chown = wimfs_chown,
.destroy = wimfs_destroy,
-#if 0
- .fallocate = wimfs_fallocate,
-#endif
.fgetattr = wimfs_fgetattr,
.ftruncate = wimfs_ftruncate,
.getattr = wimfs_getattr,
};
-/* Mounts an image from a WIM file. */
-WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
- int mount_flags, WIMStruct **additional_swms,
- unsigned num_additional_swms,
- const char *staging_dir)
+/* API function documented in wimlib.h */
+WIMLIBAPI int
+wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
+ int mount_flags, const char *staging_dir)
{
int argc;
char *argv[16];
int ret;
char *dir_copy;
- struct wim_lookup_table *joined_tab, *wim_tab_save;
struct wim_image_metadata *imd;
struct wimfs_context ctx;
- struct hlist_node *cur_node;
struct wim_inode *inode;
DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ",
if (!wim || !dir)
return WIMLIB_ERR_INVALID_PARAM;
- ret = verify_swm_set(wim, additional_swms, num_additional_swms);
- if (ret != 0)
- return ret;
-
- if ((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) && (wim->hdr.total_parts != 1)) {
- ERROR("Cannot mount a split WIM read-write");
- return WIMLIB_ERR_SPLIT_UNSUPPORTED;
- }
-
- 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;
- }
+ if (mount_flags & ~(WIMLIB_MOUNT_FLAG_READWRITE |
+ WIMLIB_MOUNT_FLAG_DEBUG |
+ WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |
+ WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR |
+ WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS |
+ WIMLIB_MOUNT_FLAG_UNIX_DATA |
+ WIMLIB_MOUNT_FLAG_ALLOW_OTHER))
+ return WIMLIB_ERR_INVALID_PARAM;
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
- ret = wim_run_full_verifications(wim);
- if (ret != 0)
- goto out;
+ ret = can_delete_from_wim(wim);
+ if (ret)
+ return ret;
}
ret = select_wim_image(wim, image);
- if (ret != 0)
- goto out;
+ if (ret)
+ return ret;
DEBUG("Selected image %d", image);
imd = wim_get_current_image_metadata(wim);
- if (imd->root_dentry->refcnt != 1) {
- ERROR("Cannot mount image that was just exported with "
- "wimlib_export_image()");
- ret = WIMLIB_ERR_INVALID_PARAM;
- goto out;
- }
-
- if (imd->inode_list.first) /* May be unneeded? */
- imd->inode_list.first->pprev = &imd->inode_list.first;
-
if (imd->modified) {
- ERROR("Cannot mount image that was added "
- "with wimlib_add_image()");
- ret = WIMLIB_ERR_INVALID_PARAM;
- goto out;
+ /* wimfs_read() only supports a limited number of stream
+ * locations, not including RESOURCE_IN_FILE_ON_DISK,
+ * RESOURCE_IN_NTFS_VOLUME, etc. that might appear if files were
+ * added to the WIM image. */
+ ERROR("Cannot mount an image with newly added files!");
+ return WIMLIB_ERR_INVALID_PARAM;
}
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
- ret = lock_wim(wim, wim->fp);
- if (ret != 0)
- goto out;
+ ret = lock_wim(wim, wim->in_fd.fd);
+ if (ret)
+ return ret;
}
/* Use default stream interface if one was not specified */
WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)))
mount_flags |= WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR;
-
DEBUG("Initializing struct wimfs_context");
init_wimfs_context(&ctx);
ctx.wim = wim;
ctx.image_inode_list = &imd->inode_list;
ctx.default_uid = getuid();
ctx.default_gid = getgid();
+ wimlib_assert(list_empty(&imd->unhashed_streams));
if (mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
ctx.default_lookup_flags = LOOKUP_FLAG_ADS_OK;
DEBUG("Unlinking message queues in case they already exist");
ret = set_message_queue_names(&ctx, dir);
- if (ret != 0)
+ if (ret)
goto out_unlock;
unlink_message_queues(&ctx);
DEBUG("Preparing arguments to fuse_main()");
dir_copy = STRDUP(dir);
- if (!dir_copy)
+ if (!dir_copy) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_message_queue_names;
+ }
argc = 0;
- argv[argc++] = "imagex";
+ argv[argc++] = "wimlib";
argv[argc++] = dir_copy;
- /* disable multi-threaded operation for read-write mounts */
- if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
- argv[argc++] = "-s";
+ /* disable multi-threaded operation */
+ argv[argc++] = "-s";
if (mount_flags & WIMLIB_MOUNT_FLAG_DEBUG)
argv[argc++] = "-d";
if ((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
/* Read-write mount. Make the staging directory */
ret = make_staging_dir(&ctx, staging_dir);
- if (ret != 0)
+ if (ret)
goto out_free_dir_copy;
} else {
/* Read-only mount */
}
#endif
- /* Mark dentry tree as modified if read-write mount. */
+ /* Assign inode numbers. Also, if a read-write mount was requested,
+ * mark the dentry tree as modified, and add each stream referenced by
+ * files in the image to a list and preemptively double the number of
+ * references to each. The latter is done to allow implementing the
+ * WIMLIB_UNMOUNT_FLAG_NEW_IMAGE semantics. */
+ ctx.next_ino = 1;
+ INIT_LIST_HEAD(&ctx.orig_stream_list);
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
imd->modified = 1;
- imd->has_been_mounted_rw = 1;
+ image_for_each_inode(inode, imd) {
+ inode->i_ino = ctx.next_ino++;
+ for (unsigned i = 0; i <= inode->i_num_ads; i++) {
+ struct wim_lookup_table_entry *lte;
+
+ lte = inode_stream_lte(inode, i, wim->lookup_table);
+ if (lte)
+ lte->out_refcnt = 0;
+ }
+ }
+ image_for_each_inode(inode, imd) {
+ for (unsigned i = 0; i <= inode->i_num_ads; i++) {
+ struct wim_lookup_table_entry *lte;
+
+ lte = inode_stream_lte(inode, i,
+ wim->lookup_table);
+ if (lte) {
+ if (lte->out_refcnt == 0)
+ list_add(<e->orig_stream_list,
+ &ctx.orig_stream_list);
+ lte->out_refcnt += inode->i_nlink;
+ lte->refcnt += inode->i_nlink;
+ }
+ }
+ }
+ } else {
+ image_for_each_inode(inode, imd)
+ inode->i_ino = ctx.next_ino++;
}
- /* Resolve the lookup table entries for every inode in the image, and
- * assign inode numbers */
- DEBUG("Resolving lookup table entries and assigning inode numbers");
- ctx.next_ino = 1;
- hlist_for_each_entry(inode, cur_node, &imd->inode_list, i_hlist) {
- inode_resolve_ltes(inode, wim->lookup_table);
- inode->i_ino = ctx.next_ino++;
- }
DEBUG("(next_ino = %"PRIu64")", ctx.next_ino);
DEBUG("Calling fuse_main()");
close_message_queues(&ctx);
}
+ release_extra_refcnts(&ctx);
+
/* Try to delete the staging directory if a deletion wasn't yet
* attempted due to an earlier error */
if (ctx.staging_dir_name)
wim->wim_locked = 0;
out_free_message_queue_names:
free_message_queue_names(&ctx);
-out:
- if (num_additional_swms) {
- free_lookup_table(wim->lookup_table);
- wim->lookup_table = wim_tab_save;
- }
return ret;
}
-/*
- * Unmounts the WIM file that was previously mounted on @dir by using
- * wimlib_mount_image().
- */
-WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
- wimlib_progress_func_t progress_func)
+/* API function documented in wimlib.h */
+WIMLIBAPI int
+wimlib_unmount_image_with_progress(const tchar *dir, int unmount_flags,
+ wimlib_progress_func_t progfunc, void *progctx)
{
int ret;
struct wimfs_context wimfs_ctx;
+ if (unmount_flags & ~(WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY |
+ WIMLIB_UNMOUNT_FLAG_COMMIT |
+ WIMLIB_UNMOUNT_FLAG_REBUILD |
+ WIMLIB_UNMOUNT_FLAG_RECOMPRESS |
+ WIMLIB_UNMOUNT_FLAG_LAZY |
+ WIMLIB_UNMOUNT_FLAG_NEW_IMAGE))
+ return WIMLIB_ERR_INVALID_PARAM;
+
init_wimfs_context(&wimfs_ctx);
ret = set_message_queue_names(&wimfs_ctx, dir);
ret = send_unmount_request_msg(wimfs_ctx.unmount_to_daemon_mq,
unmount_flags,
- progress_func != NULL);
+ progfunc != NULL);
if (ret != 0)
goto out_close_message_queues;
- ret = execute_fusermount(dir);
+ ret = execute_fusermount(dir, (unmount_flags & WIMLIB_UNMOUNT_FLAG_LAZY) != 0);
if (ret != 0)
goto out_close_message_queues;
.timeout_seconds = 5,
},
.daemon_pid = 0,
- .progress_func = progress_func,
+ .progfunc = progfunc,
+ .progctx = progctx,
};
ret = message_loop(wimfs_ctx.daemon_to_unmount_mq,
#else /* WITH_FUSE */
-static inline int mount_unsupported_error()
+static int
+mount_unsupported_error(void)
{
+#if defined(__WIN32__)
+ ERROR("Sorry-- Mounting WIM images is not supported on Windows!");
+#else
ERROR("wimlib was compiled with --without-fuse, which disables support "
"for mounting WIMs.");
+#endif
return WIMLIB_ERR_UNSUPPORTED;
}
-WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
- wimlib_progress_func_t progress_func)
+WIMLIBAPI int
+wimlib_unmount_image_with_progress(const tchar *dir, int unmount_flags,
+ wimlib_progress_func_t progfunc, void *progctx)
{
return mount_unsupported_error();
}
-WIMLIBAPI int wimlib_mount_image(WIMStruct *wim_p, int image, const char *dir,
- int mount_flags, WIMStruct **additional_swms,
- unsigned num_additional_swms,
- const char *staging_dir)
+WIMLIBAPI int
+wimlib_mount_image(WIMStruct *wim, int image, const tchar *dir,
+ int mount_flags, const tchar *staging_dir)
{
return mount_unsupported_error();
}
-#endif /* WITH_FUSE */
+#endif /* !WITH_FUSE */
+
+
+WIMLIBAPI int
+wimlib_unmount_image(const tchar *dir, int unmount_flags)
+{
+ return wimlib_unmount_image_with_progress(dir, unmount_flags, NULL, NULL);
+}
git://wimlib.net / wimlib / blobdiff