Compile on FreeBSD

[wimlib] / src / mount.c

diff --git a/src/mount.c b/src/mount.c
index 6f50a4e5931d5d2b59a8dace45422edb7fb92b23..f152fcd726d4d7e7f1e7dc287f566cf66fdc17ce 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -44,6 +44,7 @@
 #include <fuse.h>
 #include <ftw.h>
 #include <mqueue.h>
+#include <utime.h>
 
 #ifdef ENABLE_XATTR
 #include <attr/xattr.h>
@@ -592,8 +593,8 @@ static inline int delete_staging_dir()
  * 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, 
@@ -681,7 +682,7 @@ static int open_message_queues(bool daemon)
        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;
@@ -695,7 +696,7 @@ static int open_message_queues(bool daemon)
        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;
@@ -1376,6 +1377,31 @@ static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
        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)
 {
@@ -1388,12 +1414,6 @@ static int wimfs_release(const char *path, struct fuse_file_info *fi)
                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);
 }
 
@@ -1655,7 +1675,7 @@ static int wimfs_truncate(const char *path, off_t size)
                ret = extract_resource_to_staging_dir(dentry, stream_idx,
                                                      &lte, size);
        }
-       dentry_update_all_timestamps(dentry);
+       dentry_link_group_update_times(dentry);
        return ret;
 }
 
@@ -1688,6 +1708,7 @@ static int wimfs_unlink(const char *path)
        return 0;
 }
 
+#ifdef HAVE_UTIMENSAT
 /* 
  * Change the timestamp on a file dentry. 
  *
@@ -1698,20 +1719,36 @@ static int wimfs_utimens(const char *path, const struct timespec tv[2])
        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
@@ -1736,6 +1773,12 @@ static int wimfs_write(const char *path, const char *buf, size_t size,
        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;
 }
 
@@ -1775,7 +1818,11 @@ static struct fuse_operations wimfs_operations = {
        .symlink     = wimfs_symlink,
        .truncate    = wimfs_truncate,
        .unlink      = wimfs_unlink,
+#ifdef HAVE_UTIMENSAT
        .utimens     = wimfs_utimens,
+#else
+       .utime       = wimfs_utime,
+#endif
        .write       = wimfs_write,
 };
 
@@ -1936,6 +1983,7 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
                /* Read-only mount */
                strcat(optstring, ",ro");
        }
+       strcat(optstring, ",subtype=wimfs,attr_timeout=0");
        argv[argc] = NULL;
 
 #ifdef ENABLE_DEBUG
@@ -1995,6 +2043,7 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags)
         */
 
        mount_dir = dir;
+
        pid = fork();
        if (pid == -1) {
                ERROR_WITH_ERRNO("Failed to fork()");