* mount_image.c
*
* This file implements mounting of WIM images using FUSE
- * (Filesystem in Userspace). See http://fuse.sourceforge.net/.
+ * (Filesystem in Userspace). See https://github.com/libfuse/libfuse
*
* Currently it is only expected to work on Linux.
*/
/*
- * Copyright (C) 2012-2016 Eric Biggers
+ * Copyright 2012-2023 Eric Biggers
*
* This file 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
* details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with this file; if not, see http://www.gnu.org/licenses/.
+ * along with this file; if not, see https://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
#ifdef WITH_FUSE
-#ifdef __WIN32__
+#ifdef _WIN32
# error "FUSE mount not supported on Windows! Please configure --without-fuse"
#endif
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
#include <sys/types.h> /* sometimes required before <sys/xattr.h> */
#include <sys/xattr.h>
#include <fuse.h>
#include <limits.h>
#include <mqueue.h>
-#include <pthread.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include "wimlib/paths.h"
#include "wimlib/progress.h"
#include "wimlib/reparse.h"
+#include "wimlib/threads.h"
#include "wimlib/timestamp.h"
#include "wimlib/unix_data.h"
#include "wimlib/write.h"
# define ENOATTR ENODATA
#endif
+#ifndef RENAME_NOREPLACE
+# define RENAME_NOREPLACE (1 << 0)
+#endif
+#ifndef RENAME_EXCHANGE
+# define RENAME_EXCHANGE (1 << 1)
+#endif
+
#define WIMFS_MQUEUE_NAME_LEN 32
#define WIMLIB_UNMOUNT_FLAG_SEND_PROGRESS 0x80000000
static mode_t
fuse_mask_mode(mode_t mode, const 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;
+ return mode & ~fuse_ctx->umask;
}
/*
touch_inode(dentry->d_parent->d_inode);
}
+/*
+ * Update inode metadata after a regular file's contents have changed:
+ *
+ * - Update the timestamps
+ * - Clear the setuid and setgid bits
+ */
+static void
+file_contents_changed(struct wim_inode *inode)
+{
+ struct wimlib_unix_data unix_data;
+ bool ok;
+
+ touch_inode(inode);
+
+ if (inode_get_unix_data(inode, &unix_data)) {
+ unix_data.mode &= ~(S_ISUID | S_ISGID);
+ ok = inode_set_unix_data(inode, &unix_data, UNIX_DATA_MODE);
+ /*
+ * This cannot fail because no memory allocation should have
+ * been required, as the UNIX data already exists.
+ */
+ wimlib_assert(ok);
+ } /* Else, set[ug]id can't be set, so there's nothing to do. */
+}
+
/*
* Create a new file in the staging directory for a read-write mounted image.
*
name[STAGING_FILE_NAME_LEN] = '\0';
retry:
- randomize_char_array_with_alnum(name, STAGING_FILE_NAME_LEN);
+ get_random_alnum_chars(name, STAGING_FILE_NAME_LEN);
fd = openat(ctx->staging_dir_fd, name,
O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
if (unlikely(fd < 0)) {
prepare_unhashed_blob(new_blob, inode, strm->stream_id,
&wim_get_current_image_metadata(ctx->wim)->unhashed_blobs);
inode_replace_stream_blob(inode, strm, new_blob, ctx->wim->blob_table);
+ if (size != blob_size(old_blob))
+ file_contents_changed(inode);
return 0;
out_revert_fd_changes:
p = staging_dir_name;
p = mempcpy(p, wim_basename, wim_basename_len);
p = mempcpy(p, common_suffix, sizeof(common_suffix));
- randomize_char_array_with_alnum(p, random_suffix_len);
+ get_random_alnum_chars(p, random_suffix_len);
p += random_suffix_len;
*p = '\0';
return ret;
}
+static void *
+wimfs_init(struct fuse_conn_info *conn, struct fuse_config *cfg)
+{
+ /*
+ * Cache positive name lookups indefinitely, since names can only be
+ * added, removed, or modified through the mounted filesystem itself.
+ */
+ cfg->entry_timeout = 1000000000;
+
+ /*
+ * Cache negative name lookups indefinitely, since names can only be
+ * added, removed, or modified through the mounted filesystem itself.
+ */
+ cfg->negative_timeout = 1000000000;
+
+ /*
+ * Don't cache file/directory attributes. This is needed as a
+ * workaround for the fact that when caching attributes, the high level
+ * interface to libfuse considers a file which has several hard-linked
+ * names as several different files. (Otherwise, we could cache our
+ * file/directory attributes indefinitely, since they can only be
+ * changed through the mounted filesystem itself.)
+ */
+ cfg->attr_timeout = 0;
+
+ /*
+ * If an open file is unlinked, unlink it for real rather than renaming
+ * it to a hidden file. Our code supports this; an unlinked inode is
+ * retained until all its file descriptors have been closed.
+ */
+ cfg->hard_remove = 1;
+
+ /*
+ * Make FUSE use the inode numbers we provide. We want this, because we
+ * have inodes and will number them ourselves.
+ */
+ cfg->use_ino = 1;
+
+ /*
+ * Cache the contents of files. This will speed up repeated access to
+ * files on a mounted WIM image, since they won't need to be
+ * decompressed repeatedly. This option is valid because data in the
+ * WIM image should never be changed externally. (Although, if someone
+ * really wanted to they could modify the WIM file or mess with the
+ * staging directory; but then they're asking for trouble.)
+ */
+ cfg->kernel_cache = 1;
+
+ /*
+ * We keep track of file descriptor structures (struct wimfs_fd), so
+ * there is no need to have the file path provided on operations such as
+ * read().
+ */
+ cfg->nullpath_ok = 1;
+
+ return wimfs_get_context();
+}
+
static int
-wimfs_chmod(const char *path, mode_t mask)
+wimfs_chmod(const char *path, mode_t mask, struct fuse_file_info *fi)
{
const struct wimfs_context *ctx = wimfs_get_context();
struct wim_inode *inode;
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
return -EOPNOTSUPP;
- inode = wim_pathname_to_inode(ctx->wim, path);
- if (!inode)
- return -errno;
-
+ if (fi) {
+ inode = WIMFS_FD(fi)->f_inode;
+ } else {
+ inode = wim_pathname_to_inode(ctx->wim, path);
+ if (!inode)
+ return -errno;
+ }
unix_data.uid = ctx->owner_uid;
unix_data.gid = ctx->owner_gid;
unix_data.mode = mask;
}
static int
-wimfs_chown(const char *path, uid_t uid, gid_t gid)
+wimfs_chown(const char *path, uid_t uid, gid_t gid, struct fuse_file_info *fi)
{
const struct wimfs_context *ctx = wimfs_get_context();
struct wim_inode *inode;
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
return -EOPNOTSUPP;
- inode = wim_pathname_to_inode(ctx->wim, path);
- if (!inode)
- return -errno;
+ if (fi) {
+ inode = WIMFS_FD(fi)->f_inode;
+ } else {
+ inode = wim_pathname_to_inode(ctx->wim, path);
+ if (!inode)
+ return -errno;
+ }
which = 0;
}
static int
-wimfs_fgetattr(const char *path, struct stat *stbuf, struct fuse_file_info *fi)
-{
- struct wimfs_fd *fd = WIMFS_FD(fi);
- return inode_to_stbuf(fd->f_inode, fd->f_blob, stbuf);
-}
-
-static int
-wimfs_ftruncate(const char *path, off_t size, struct fuse_file_info *fi)
-{
- struct wimfs_fd *fd = WIMFS_FD(fi);
- if (ftruncate(fd->f_staging_fd.fd, size))
- return -errno;
- touch_inode(fd->f_inode);
- fd->f_blob->size = size;
- return 0;
-}
-
-static int
-wimfs_getattr(const char *path, struct stat *stbuf)
+wimfs_getattr(const char *path, struct stat *stbuf, struct fuse_file_info *fi)
{
const struct wimfs_context *ctx = wimfs_get_context();
- struct wim_dentry *dentry;
- struct wim_inode_stream *strm;
+ const struct wim_inode *inode;
+ const struct blob_descriptor *blob;
int ret;
- ret = wim_pathname_to_stream(ctx, path, LOOKUP_FLAG_DIRECTORY_OK,
- &dentry, &strm);
- if (ret)
- return ret;
+ if (fi) {
+ const struct wimfs_fd *fd = WIMFS_FD(fi);
- return inode_to_stbuf(dentry->d_inode,
- stream_blob_resolved(strm), stbuf);
+ inode = fd->f_inode;
+ blob = fd->f_blob;
+ } else {
+ struct wim_dentry *dentry;
+ struct wim_inode_stream *strm;
+
+ ret = wim_pathname_to_stream(ctx, path,
+ LOOKUP_FLAG_DIRECTORY_OK,
+ &dentry, &strm);
+ if (ret)
+ return ret;
+ inode = dentry->d_inode;
+ blob = stream_blob_resolved(strm);
+ }
+
+ return inode_to_stbuf(inode, blob, stbuf);
}
static int
const struct wimfs_context *ctx = wimfs_get_context();
const struct wim_inode *inode;
char *p = list;
- char *end = list + size;
int total_size = 0;
if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
total_size += stream_name_mbs_nbytes + 6;
if (size) {
- if (end - p < stream_name_mbs_nbytes + 6) {
+ if (list + size - p < stream_name_mbs_nbytes + 6) {
FREE(stream_name_mbs);
return -ERANGE;
}
int raw_fd;
raw_fd = openat(blob->staging_dir_fd, blob->staging_file_name,
- (fi->flags & O_ACCMODE) | O_NOFOLLOW);
+ (fi->flags & (O_ACCMODE | O_TRUNC)) |
+ O_NOFOLLOW);
if (raw_fd < 0) {
close_wimfs_fd(fd);
return -errno;
}
filedes_init(&fd->f_staging_fd, raw_fd);
+ if (fi->flags & O_TRUNC) {
+ blob->size = 0;
+ file_contents_changed(inode);
+ }
}
fi->fh = (uintptr_t)fd;
return 0;
static int
wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
- off_t offset, struct fuse_file_info *fi)
+ off_t offset, struct fuse_file_info *fi,
+ enum fuse_readdir_flags flags)
{
struct wimfs_fd *fd = WIMFS_FD(fi);
const struct wim_inode *inode;
inode = fd->f_inode;
- ret = filler(buf, ".", NULL, 0);
+ ret = filler(buf, ".", NULL, 0, 0);
if (ret)
return ret;
- ret = filler(buf, "..", NULL, 0);
+ ret = filler(buf, "..", NULL, 0, 0);
if (ret)
return ret;
&name, &name_nbytes))
return -errno;
- ret = filler(buf, name, NULL, 0);
+ ret = filler(buf, name, NULL, 0, 0);
FREE(name);
if (ret)
return ret;
}
static int
-wimfs_rename(const char *from, const char *to)
+wimfs_rename(const char *from, const char *to, unsigned int flags)
{
+ if (flags & RENAME_EXCHANGE)
+ return -EINVAL;
return rename_wim_path(wimfs_get_WIMStruct(), from, to,
- WIMLIB_CASE_SENSITIVE, NULL);
+ WIMLIB_CASE_SENSITIVE,
+ (flags & RENAME_NOREPLACE), NULL);
}
static int
}
static int
-wimfs_truncate(const char *path, off_t size)
+do_truncate(int staging_fd, off_t size,
+ struct wim_inode *inode, struct blob_descriptor *blob)
+{
+ if (ftruncate(staging_fd, size))
+ return -errno;
+ file_contents_changed(inode);
+ blob->size = size;
+ return 0;
+}
+
+static int
+wimfs_truncate(const char *path, off_t size, struct fuse_file_info *fi)
{
const struct wimfs_context *ctx = wimfs_get_context();
struct wim_dentry *dentry;
struct wim_inode_stream *strm;
struct blob_descriptor *blob;
int ret;
- int fd;
+ int staging_fd;
+
+ if (fi) {
+ struct wimfs_fd *fd = WIMFS_FD(fi);
+
+ return do_truncate(fd->f_staging_fd.fd, size, fd->f_inode,
+ fd->f_blob);
+ }
ret = wim_pathname_to_stream(ctx, path, 0, &dentry, &strm);
if (ret)
}
/* Truncate the staging file. */
- fd = openat(blob->staging_dir_fd, blob->staging_file_name,
- O_WRONLY | O_NOFOLLOW);
- if (fd < 0)
+ staging_fd = openat(blob->staging_dir_fd, blob->staging_file_name,
+ O_WRONLY | O_NOFOLLOW);
+ if (staging_fd < 0)
return -errno;
- ret = ftruncate(fd, size);
- if (close(fd) || ret)
- return -errno;
- blob->size = size;
- touch_inode(dentry->d_inode);
- return 0;
+ ret = do_truncate(staging_fd, size, dentry->d_inode, blob);
+ if (close(staging_fd) && !ret)
+ ret = -errno;
+ return ret;
}
static int
return 0;
}
-#ifdef HAVE_UTIMENSAT
/*
* Change the timestamp on a file dentry.
*
* Note that alternate data streams do not have their own timestamps.
*/
static int
-wimfs_utimens(const char *path, const struct timespec tv[2])
+wimfs_utimens(const char *path, const struct timespec tv[2],
+ struct fuse_file_info *fi)
{
- WIMStruct *wim = wimfs_get_WIMStruct();
struct wim_inode *inode;
- inode = wim_pathname_to_inode(wim, path);
- if (!inode)
- return -errno;
+ if (fi) {
+ inode = WIMFS_FD(fi)->f_inode;
+ } else {
+ inode = wim_pathname_to_inode(wimfs_get_WIMStruct(), path);
+ if (!inode)
+ return -errno;
+ }
if (tv[0].tv_nsec != UTIME_OMIT) {
if (tv[0].tv_nsec == UTIME_NOW)
}
return 0;
}
-#else /* HAVE_UTIMENSAT */
-static int
-wimfs_utime(const char *path, struct utimbuf *times)
-{
- WIMStruct *wim = wimfs_get_WIMStruct();
- struct wim_inode *inode;
-
- inode = wim_pathname_to_inode(wim, path);
- if (!inode)
- return -errno;
-
- inode->i_last_access_time = time_t_to_wim_timestamp(times->actime);
- inode->i_last_write_time = time_t_to_wim_timestamp(times->modtime);
- return 0;
-}
-#endif /* !HAVE_UTIMENSAT */
static int
wimfs_write(const char *path, const char *buf, size_t size,
if (offset + size > fd->f_blob->size)
fd->f_blob->size = offset + size;
- touch_inode(fd->f_inode);
+ file_contents_changed(fd->f_inode);
return ret;
}
static const struct fuse_operations wimfs_operations = {
+ .init = wimfs_init,
.chmod = wimfs_chmod,
.chown = wimfs_chown,
- .fgetattr = wimfs_fgetattr,
- .ftruncate = wimfs_ftruncate,
.getattr = wimfs_getattr,
.getxattr = wimfs_getxattr,
.link = wimfs_link,
.symlink = wimfs_symlink,
.truncate = wimfs_truncate,
.unlink = wimfs_unlink,
-#ifdef HAVE_UTIMENSAT
.utimens = wimfs_utimens,
-#else
- .utime = wimfs_utime,
-#endif
.write = wimfs_write,
- /* We keep track of file descriptor structures (struct wimfs_fd), so
- * there is no need to have the file path provided on operations such as
- * read(). */
-#if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8)
- .flag_nullpath_ok = 1,
-#endif
-#if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 9)
- .flag_nopath = 1,
- .flag_utime_omit_ok = 1,
-#endif
};
/* API function documented in wimlib.h */
/*
* Build the FUSE mount options:
*
- * use_ino
- * FUSE will use the inode numbers we provide. We want this,
- * because we have inodes and will number them ourselves.
- *
* subtype=wimfs
* Name for our filesystem (main type is "fuse").
*
- * hard_remove
- * If an open file is unlinked, unlink it for real rather than
- * renaming it to a hidden file. Our code supports this; an
- * unlinked inode is retained until all its file descriptors have
- * been closed.
- *
* default_permissions
* FUSE will perform permission checking. Useful when
* WIMLIB_MOUNT_FLAG_UNIX_DATA is provided and the WIM image
* contains the UNIX permissions for each file.
- *
- * kernel_cache
- * Cache the contents of files. This will speed up repeated access
- * to files on a mounted WIM image, since they won't need to be
- * decompressed repeatedly. This option is valid because data in
- * the WIM image should never be changed externally. (Although, if
- * someone really wanted to they could modify the WIM file or mess
- * with the staging directory; but then they're asking for
- * trouble.)
- *
- * entry_timeout=1000000000
- * Cache positive name lookups indefinitely, since names can only
- * be added, removed, or modified through the mounted filesystem
- * itself.
- *
- * negative_timeout=1000000000
- * Cache negative name lookups indefinitely, since names can only
- * be added, removed, or modified through the mounted filesystem
- * itself.
- *
- * attr_timeout=0
- * Don't cache file/directory attributes. This is needed as a
- * workaround for the fact that when caching attributes, the high
- * level interface to libfuse considers a file which has several
- * hard-linked names as several different files. (Otherwise, we
- * could cache our file/directory attributes indefinitely, since
- * they can only be changed through the mounted filesystem itself.)
*/
- char optstring[256] =
- "use_ino"
- ",subtype=wimfs"
- ",hard_remove"
- ",default_permissions"
- ",kernel_cache"
- ",entry_timeout=1000000000"
- ",negative_timeout=1000000000"
- ",attr_timeout=0"
- ;
+ char optstring[128] = "subtype=wimfs,default_permissions";
fuse_argv[fuse_argc++] = "-o";
fuse_argv[fuse_argc++] = optstring;
if (!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE))
{
name[0] = '/';
memcpy(name + 1, "wimfs-", 6);
- randomize_char_array_with_alnum(name + 7, WIMFS_MQUEUE_NAME_LEN - 7);
+ get_random_alnum_chars(name + 7, WIMFS_MQUEUE_NAME_LEN - 7);
name[WIMFS_MQUEUE_NAME_LEN] = '\0';
}
wimlib_progress_func_t progfunc, void *progctx)
{
struct wimfs_unmount_info unmount_info;
- mqd_t mq;
+ mqd_t mq = (mqd_t)-1;
struct commit_progress_thread_args args;
- pthread_t commit_progress_tid;
+ struct thread commit_progress_tid;
int ret;
memset(&unmount_info, 0, sizeof(unmount_info));
args.mq = mq;
args.progfunc = progfunc;
args.progctx = progctx;
- ret = pthread_create(&commit_progress_tid, NULL,
- commit_progress_thread_proc, &args);
- if (ret) {
- errno = ret;
- ERROR_WITH_ERRNO("Can't create thread");
+ if (!thread_create(&commit_progress_tid,
+ commit_progress_thread_proc, &args)) {
ret = WIMLIB_ERR_NOMEM;
goto out_delete_mq;
}
/* Terminate the progress thread. */
char empty[1];
mq_send(mq, empty, 0, 1);
- pthread_join(commit_progress_tid, NULL);
+ thread_join(&commit_progress_tid);
}
out_delete_mq:
if (progfunc) {
static int
mount_unsupported_error(void)
{
-#if defined(__WIN32__)
+#ifdef _WIN32
ERROR("Sorry-- Mounting WIM images is not supported on Windows!");
#else
ERROR("wimlib was compiled with --without-fuse, which disables support "
git://wimlib.net / wimlib / blobdiff