]> wimlib.net Git - wimlib/blobdiff - src/extract.c
Comments
[wimlib] / src / extract.c
index 701d1294deb95db4d8d27e753f4b4f2078c2d45c..ec6842dcf826ab96a4ea3146e416ab20000130ee 100644 (file)
@@ -2,6 +2,11 @@
  * extract.c
  *
  * Support for extracting WIM files.
+ *
+ * This code does NOT contain any filesystem-specific features.  In particular,
+ * security information (i.e. file permissions) and alternate data streams are
+ * ignored, except possibly to read an alternate data stream that contains
+ * symbolic link data.
  */
 
 /*
  * 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
@@ -54,21 +58,19 @@ static int extract_regular_file_linked(const struct dentry *dentry,
         * instead either symlinks or hardlinks *all* identical files in
         * the WIM, even if they are in a different image (in the case
         * of a multi-image extraction) */
-
-       wimlib_assert(lte->file_on_disk);
-
+       wimlib_assert(lte->extracted_file);
 
        if (extract_flags & WIMLIB_EXTRACT_FLAG_HARDLINK) {
-               if (link(lte->file_on_disk, output_path) != 0) {
+               if (link(lte->extracted_file, output_path) != 0) {
                        ERROR_WITH_ERRNO("Failed to hard link "
                                         "`%s' to `%s'",
-                                        output_path, lte->file_on_disk);
+                                        output_path, lte->extracted_file);
                        return WIMLIB_ERR_LINK;
                }
        } else {
                int num_path_components;
                int num_output_dir_path_components;
-               size_t file_on_disk_len;
+               size_t extracted_file_len;
                char *p;
                const char *p2;
                size_t i;
@@ -84,9 +86,9 @@ static int extract_regular_file_linked(const struct dentry *dentry,
                        num_path_components++;
                        num_output_dir_path_components--;
                }
-               file_on_disk_len = strlen(lte->file_on_disk);
+               extracted_file_len = strlen(lte->extracted_file);
 
-               char buf[file_on_disk_len + 3 * num_path_components + 1];
+               char buf[extracted_file_len + 3 * num_path_components + 1];
                p = &buf[0];
 
                for (i = 0; i < num_path_components; i++) {
@@ -94,7 +96,7 @@ static int extract_regular_file_linked(const struct dentry *dentry,
                        *p++ = '.';
                        *p++ = '/';
                }
-               p2 = lte->file_on_disk;
+               p2 = lte->extracted_file;
                while (*p2 == '/')
                        p2++;
                while (num_output_dir_path_components--)
@@ -103,7 +105,7 @@ static int extract_regular_file_linked(const struct dentry *dentry,
                if (symlink(buf, output_path) != 0) {
                        ERROR_WITH_ERRNO("Failed to symlink `%s' to "
                                         "`%s'",
-                                        buf, lte->file_on_disk);
+                                        buf, lte->extracted_file);
                        return WIMLIB_ERR_LINK;
                }
 
@@ -125,7 +127,9 @@ static int extract_regular_file_unlinked(WIMStruct *w,
        int ret;
        const struct list_head *head = &dentry->link_group_list;
 
-       if (head->next != head) {
+       if (head->next != head &&
+            !(extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE))
+       {
                /* This dentry is one of a hard link set of at least 2 dentries.
                 * If one of the other dentries has already been extracted, make
                 * a hard link to the file corresponding to this
@@ -171,26 +175,12 @@ static int extract_regular_file_unlinked(WIMStruct *w,
                goto done;
        }
 
-
-       res_entry = &lte->resource_entry;
-
-       ret = extract_resource_to_fd(w, res_entry, out_fd, 
-                                    res_entry->original_size);
-
+       ret = extract_full_wim_resource_to_fd(lte, out_fd);
        if (ret != 0) {
                ERROR("Failed to extract resource to `%s'", output_path);
                goto done;
        }
 
-       if (extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) {
-               /* Mark the lookup table entry to indicate this file has been
-                * extracted. */
-               lte->out_refcnt++;
-               FREE(lte->file_on_disk);
-               lte->file_on_disk = STRDUP(output_path);
-               if (!lte->file_on_disk)
-                       ret = WIMLIB_ERR_NOMEM;
-       }
 done:
        if (close(out_fd) != 0) {
                ERROR_WITH_ERRNO("Failed to close file `%s'", output_path);
@@ -214,12 +204,12 @@ static int extract_regular_file(WIMStruct *w,
 
        if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK |
                              WIMLIB_EXTRACT_FLAG_HARDLINK)) && lte) {
-               if (lte->out_refcnt++ != 0)
+               if (++lte->out_refcnt != 1)
                        return extract_regular_file_linked(dentry, output_dir,
                                                           output_path,
                                                           extract_flags, lte);
-               lte->file_on_disk = STRDUP(output_path);
-               if (!lte->file_on_disk)
+               lte->extracted_file = STRDUP(output_path);
+               if (!lte->extracted_file)
                        return WIMLIB_ERR_NOMEM;
        }
 
@@ -254,22 +244,32 @@ static int extract_symlink(const struct dentry *dentry, const char *output_path,
  * @output_path:       The path to which the directory is to be extracted to.
  * @return:            True on success, false on failure. 
  */
-static int extract_directory(const char *output_path)
+static int extract_directory(const char *output_path, bool is_root)
 {
-       /* Compute the output path directory to the directory. */
-       if (mkdir(output_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0) 
-       {
-               switch (errno) {
-               case EEXIST: /* Already existing directory is OK */
-               case EACCES: /* We may have permissions to extract files inside
-                                the directory, but not for the directory
-                                itself. */
+       int ret;
+       struct stat stbuf;
+       ret = stat(output_path, &stbuf);
+       if (ret == 0) {
+               if (S_ISDIR(stbuf.st_mode)) {
+                       if (!is_root)
+                               WARNING("`%s' already exists", output_path);
                        return 0;
-               default:
-                       ERROR_WITH_ERRNO("Cannot create directory `%s'",
-                                        output_path);
+               } else {
+                       ERROR("`%s' is not a directory", output_path);
                        return WIMLIB_ERR_MKDIR;
                }
+       } else {
+               if (errno != ENOENT) {
+                       ERROR_WITH_ERRNO("Failed to stat `%s'", output_path);
+                       return WIMLIB_ERR_STAT;
+               }
+       }
+       /* Compute the output path directory to the directory. */
+       if (mkdir(output_path, S_IRWXU | S_IRGRP | S_IXGRP |
+                              S_IROTH | S_IXOTH) != 0) {
+               ERROR_WITH_ERRNO("Cannot create directory `%s'",
+                                output_path);
+               return WIMLIB_ERR_MKDIR;
        }
        return 0;
 }
@@ -308,13 +308,27 @@ static int extract_dentry(struct dentry *dentry, void *arg)
        if (dentry_is_symlink(dentry))
                ret = extract_symlink(dentry, output_path, w);
        else if (dentry_is_directory(dentry))
-               ret = extract_directory(output_path);
+               ret = extract_directory(output_path, dentry_is_root(dentry));
        else
                ret = extract_regular_file(w, dentry, args->output_dir,
                                            output_path, extract_flags);
        if (ret != 0)
                return ret;
 
+       return 0;
+}
+
+/* Apply timestamp to extracted file */
+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]);
@@ -345,7 +359,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);
+
 }
 
 
@@ -363,7 +382,7 @@ static int extract_all_images(WIMStruct *w, const char *output_dir,
 
        DEBUG("Attempting to extract all images from `%s'", w->filename);
 
-       ret = extract_directory(output_dir);
+       ret = extract_directory(output_dir, true);
        if (ret != 0)
                return ret;
 
@@ -392,7 +411,6 @@ done:
 WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image,
                                   const char *output_dir, int flags)
 {
-
        if (!output_dir)
                return WIMLIB_ERR_INVALID_PARAM;
 
@@ -400,33 +418,6 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image,
                        == (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK))
                return WIMLIB_ERR_INVALID_PARAM;
 
-       if ((flags & WIMLIB_EXTRACT_FLAG_NTFS)) {
-       #ifdef WITH_NTFS_3G
-               unsigned long 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);
-                       return WIMLIB_ERR_NTFS_3G;
-               }
-               if (!(mnt_flags & NTFS_MF_MOUNTED)) {
-                       ERROR("NTFS-3g: Filesystem on `%s' is not mounted ",
-                             output_dir);
-                       return WIMLIB_ERR_NTFS_3G;
-               }
-               if (mnt_flags & NTFS_MF_READONLY) {
-                       ERROR("NTFS-3g: Filesystem on `%s' is mounted "
-                             "read-only", output_dir);
-                       return WIMLIB_ERR_NTFS_3G;
-               }
-       #else
-               ERROR("wimlib was compiled without support for NTFS-3g, so");
-               ERROR("we cannot extract a WIM image while preserving NTFS-");
-               ERROR("specific information");
-               return WIMLIB_ERR_UNSUPPORTED;
-       #endif
-       }
-
        for_lookup_table_entry(w->lookup_table, zero_out_refcnts, NULL);
 
        if (image == WIM_ALL_IMAGES) {