Cleanup timestamp conversion code

[wimlib] / src / unix_capture.c

diff --git a/src/unix_capture.c b/src/unix_capture.c
index 753da47f05614a696ff20407661049cc49eb92a7..488996aa3a9bafa2db4955cee61a677334dbfbd5 100644 (file)
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -121,6 +121,7 @@ unix_scan_regular_file(const char *path, u64 size, struct wim_inode *inode,
                return WIMLIB_ERR_NOMEM;
        }
        lte->file_on_disk = file_on_disk;
+       lte->file_inode = inode;
        lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
        lte->size = size;
        add_unhashed_stream(lte, inode, 0, unhashed_streams);
@@ -132,13 +133,13 @@ static int
 unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
                                 char *path, size_t path_len,
                                 int dirfd, const char *relpath,
-                                struct add_image_params *params);
+                                struct capture_params *params);
 
 static int
 unix_scan_directory(struct wim_dentry *dir_dentry,
                    char *full_path, size_t full_path_len,
                    int parent_dirfd, const char *dir_relpath,
-                   struct add_image_params *params)
+                   struct capture_params *params)
 {
 
        int dirfd;
@@ -250,7 +251,7 @@ unix_fixup_abslink(char *dest, u64 ino, u64 dev)
 
 static int
 unix_scan_symlink(const char *full_path, int dirfd, const char *relpath,
-                 struct wim_inode *inode, struct add_image_params *params)
+                 struct wim_inode *inode, struct capture_params *params)
 {
        char deref_name_buf[4096];
        ssize_t deref_name_len;
@@ -325,7 +326,7 @@ static int
 unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
                                 char *full_path, size_t full_path_len,
                                 int dirfd, const char *relpath,
-                                struct add_image_params *params)
+                                struct capture_params *params)
 {
        struct wim_dentry *tree = NULL;
        struct wim_inode *inode = NULL;
@@ -387,13 +388,13 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
                goto out_progress;
 
 #ifdef HAVE_STAT_NANOSECOND_PRECISION
-       inode->i_creation_time = timespec_to_wim_timestamp(stbuf.st_mtim);
-       inode->i_last_write_time = timespec_to_wim_timestamp(stbuf.st_mtim);
-       inode->i_last_access_time = timespec_to_wim_timestamp(stbuf.st_atim);
+       inode->i_creation_time = timespec_to_wim_timestamp(&stbuf.st_mtim);
+       inode->i_last_write_time = timespec_to_wim_timestamp(&stbuf.st_mtim);
+       inode->i_last_access_time = timespec_to_wim_timestamp(&stbuf.st_atim);
 #else
-       inode->i_creation_time = unix_timestamp_to_wim(stbuf.st_mtime);
-       inode->i_last_write_time = unix_timestamp_to_wim(stbuf.st_mtime);
-       inode->i_last_access_time = unix_timestamp_to_wim(stbuf.st_atime);
+       inode->i_creation_time = time_t_to_wim_timestamp(stbuf.st_mtime);
+       inode->i_last_write_time = time_t_to_wim_timestamp(stbuf.st_mtime);
+       inode->i_last_access_time = time_t_to_wim_timestamp(stbuf.st_atime);
 #endif
        inode->i_resolved = 1;
        if (params->add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
@@ -436,10 +437,12 @@ out_progress:
        else
                ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
 out:
-       if (likely(ret == 0))
-               *tree_ret = tree;
-       else
+       if (unlikely(ret)) {
                free_dentry_tree(tree, params->lookup_table);
+               tree = NULL;
+               ret = report_capture_error(params, ret, full_path);
+       }
+       *tree_ret = tree;
        return ret;
 }
 
@@ -454,7 +457,7 @@ out:
  *
  * @root_disk_path:  The path to the root of the directory tree on disk.
  *
- * @params:     See doc for `struct add_image_params'.
+ * @params:     See doc for `struct capture_params'.
  *
  * @return:    0 on success, nonzero on failure.  It is a failure if any of
  *             the files cannot be `stat'ed, or if any of the needed
@@ -466,7 +469,7 @@ out:
 int
 unix_build_dentry_tree(struct wim_dentry **root_ret,
                       const char *root_disk_path,
-                      struct add_image_params *params)
+                      struct capture_params *params)
 {
        size_t path_len;
        size_t path_bufsz;