Various fixes

[wimlib] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 1648adea343f911c5f789df65429c929598f21b1..49e45da1423aa9c5d8679880137373a0101cd9be 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -24,22 +24,28 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <unistd.h>
+
+#include "config.h"
 #include "dentry.h"
 #include "lookup_table.h"
+#include "timestamp.h"
+#include "wimlib_internal.h"
 #include "xml.h"
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <string.h>
-#include <errno.h>
 
 #ifdef WITH_NTFS_3G
 #include <ntfs-3g/volume.h>
 #include <ntfs-3g/security.h>
 #endif
 
+
 /* Internal */
 #define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000
 
@@ -209,7 +215,7 @@ static int extract_regular_file(WIMStruct *w,
 {
        struct lookup_table_entry *lte;
 
-       lte = __lookup_resource(w->lookup_table, dentry_hash(dentry));
+       lte = dentry_first_lte(dentry, w->lookup_table);
 
        if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK |
                              WIMLIB_EXTRACT_FLAG_HARDLINK)) && lte) {
@@ -283,11 +289,8 @@ struct extract_args {
 };
 
 /* 
- * Extracts a file or directory from the WIM archive.  For use in
- * for_dentry_in_tree().
- *
- * @dentry:    The dentry to extract.
- * @arg:       A pointer to the WIMStruct for the WIM file.
+ * Extracts a file, directory, or symbolic link from the WIM archive.  For use
+ * in for_dentry_in_tree().
  */
 static int extract_dentry(struct dentry *dentry, void *arg)
 {
@@ -296,24 +299,48 @@ static int extract_dentry(struct dentry *dentry, void *arg)
        int extract_flags = args->extract_flags;
        size_t len = strlen(args->output_dir);
        char output_path[len + dentry->full_path_utf8_len + 1];
-       int ret = 0;
+       int ret;
 
-       if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE)
+       if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) {
+               wimlib_assert(dentry->full_path_utf8);
                puts(dentry->full_path_utf8);
+       }
 
        memcpy(output_path, args->output_dir, len);
        memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len);
        output_path[len + dentry->full_path_utf8_len] = '\0';
 
-       if (dentry_is_symlink(dentry)) {
+       if (dentry_is_symlink(dentry))
                ret = extract_symlink(dentry, output_path, w);
-       } else if (dentry_is_directory(dentry)) {
+       else if (dentry_is_directory(dentry))
                ret = extract_directory(output_path);
-       } else {
+       else
                ret = extract_regular_file(w, dentry, args->output_dir,
-                                          output_path, extract_flags);
+                                           output_path, extract_flags);
+       if (ret != 0)
+               return ret;
+
+       return 0;
+}
+
+static int apply_dentry_timestamps(struct dentry *dentry, void *arg)
+{
+       struct extract_args *args = arg;
+       size_t len = strlen(args->output_dir);
+       char output_path[len + dentry->full_path_utf8_len + 1];
+
+       memcpy(output_path, args->output_dir, len);
+       memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len);
+       output_path[len + dentry->full_path_utf8_len] = '\0';
+
+       struct timeval tv[2];
+       wim_timestamp_to_timeval(dentry->last_access_time, &tv[0]);
+       wim_timestamp_to_timeval(dentry->last_write_time, &tv[1]);
+       if (lutimes(output_path, tv) != 0) {
+               WARNING("Failed to set timestamp on file `%s': %s",
+                       output_path, strerror(errno));
        }
-       return ret;
+       return 0;
 }
 
 
@@ -336,7 +363,12 @@ static int extract_single_image(WIMStruct *w, int image,
        #endif
        };
 
-       return for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args);
+       ret = for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args);
+       if (ret != 0)
+               return ret;
+       return for_dentry_in_tree_depth(wim_root_dentry(w),
+                                       apply_dentry_timestamps, &args);
+
 }
 
 
@@ -383,24 +415,18 @@ done:
 WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image,
                                   const char *output_dir, int flags)
 {
-       int ret;
+
        if (!output_dir)
                return WIMLIB_ERR_INVALID_PARAM;
+
        if ((flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK))
                        == (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK))
                return WIMLIB_ERR_INVALID_PARAM;
 
-       if (image == WIM_ALL_IMAGES) {
-               flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE;
-               for_lookup_table_entry(w->lookup_table, zero_out_refcnts, NULL);
-       } else {
-               flags &= ~WIMLIB_EXTRACT_FLAG_MULTI_IMAGE;
-       }
-       
        if ((flags & WIMLIB_EXTRACT_FLAG_NTFS)) {
        #ifdef WITH_NTFS_3G
                unsigned long mnt_flags;
-               ret = ntfs_check_if_mounted(output_dir, &mnt_flags);
+               int ret = ntfs_check_if_mounted(output_dir, &mnt_flags);
                if (ret != 0) {
                        ERROR_WITH_ERRNO("NTFS-3g: Cannot determine if `%s' "
                                         "is mounted", output_dir);
@@ -423,10 +449,15 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image,
                return WIMLIB_ERR_UNSUPPORTED;
        #endif
        }
-       if (image == WIM_ALL_IMAGES)
-               ret = extract_all_images(w, output_dir, flags);
-       else
-               ret = extract_single_image(w, image, output_dir, flags);
-       return ret;
+
+       for_lookup_table_entry(w->lookup_table, zero_out_refcnts, NULL);
+
+       if (image == WIM_ALL_IMAGES) {
+               flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE;
+               return extract_all_images(w, output_dir, flags);
+       } else {
+               flags &= ~WIMLIB_EXTRACT_FLAG_MULTI_IMAGE;
+               return extract_single_image(w, image, output_dir, flags);
+       }
 
 }