imagex-apply.1 updates

[wimlib] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 80cacf7906bcd58fd67835639ec7c7a3e5c46260..e42aba4d1f6d0bb8975f62088e5554fb7f34588d 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -16,16 +16,16 @@
  * This file is part of wimlib, a library for working with WIM files.
  *
  * wimlib 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
- * Software Foundation; either version 2.1 of the License, or (at your option)
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
  * any later version.
  *
  * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
@@ -277,9 +277,6 @@ struct extract_args {
        WIMStruct *w;
        int extract_flags;
        const char *output_dir;
-#ifdef WITH_NTFS_3G
-       struct SECURITY_API *scapi;
-#endif
 };
 
 /* 
@@ -293,7 +290,6 @@ 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;
 
        if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) {
                wimlib_assert(dentry->full_path_utf8);
@@ -305,16 +301,12 @@ static int extract_dentry(struct dentry *dentry, void *arg)
        output_path[len + dentry->full_path_utf8_len] = '\0';
 
        if (dentry_is_symlink(dentry))
-               ret = extract_symlink(dentry, output_path, w);
+               return extract_symlink(dentry, output_path, w);
        else if (dentry_is_directory(dentry))
-               ret = extract_directory(output_path, dentry_is_root(dentry));
+               return extract_directory(output_path, dentry_is_root(dentry));
        else
-               ret = extract_regular_file(w, dentry, args->output_dir,
+               return extract_regular_file(w, dentry, args->output_dir,
                                            output_path, extract_flags);
-       if (ret != 0)
-               return ret;
-
-       return 0;
 }
 
 /* Apply timestamp to extracted file */
@@ -353,9 +345,6 @@ static int extract_single_image(WIMStruct *w, int image,
                .w = w,
                .extract_flags = extract_flags,
                .output_dir = output_dir,
-       #ifdef WITH_NTFS_3G
-               .scapi = NULL
-       #endif
        };
 
        ret = for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args);
@@ -379,7 +368,8 @@ static int extract_all_images(WIMStruct *w, const char *output_dir,
        int image;
        const char *image_name;
 
-       DEBUG("Attempting to extract all images from `%s'", w->filename);
+       DEBUG("Attempting to extract all images from `%s' to `%s'",
+             w->filename, output_dir);
 
        ret = extract_directory(output_dir, true);
        if (ret != 0)
@@ -398,33 +388,59 @@ static int extract_all_images(WIMStruct *w, const char *output_dir,
                }
                ret = extract_single_image(w, image, buf, extract_flags);
                if (ret != 0)
-                       goto done;
+                       return ret;
        }
-done:
-       /* Restore original output directory */
-       buf[output_path_len + 1] = '\0';
        return 0;
 }
 
+
 /* Extracts a single image or all images from a WIM file. */
 WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image,
-                                  const char *output_dir, int flags)
+                                  const char *output_dir, int flags,
+                                  WIMStruct **additional_swms,
+                                  unsigned num_additional_swms)
 {
-       if (!output_dir)
+       struct lookup_table *joined_tab, *w_tab_save;
+       int ret;
+
+       DEBUG("w->filename = %s, image = %d, output_dir = %s, flags = 0x%x, "
+             "num_additional_swms = %u",
+             w->filename, image, output_dir, flags, num_additional_swms);
+
+       if (!w || !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;
 
+       ret = verify_swm_set(w, additional_swms, num_additional_swms);
+       if (ret != 0)
+               return ret;
+
+       if (num_additional_swms) {
+               ret = new_joined_lookup_table(w, additional_swms,
+                                             num_additional_swms, &joined_tab);
+               if (ret != 0)
+                       return ret;
+               w_tab_save = w->lookup_table;
+               w->lookup_table = joined_tab;
+       }
+
+
        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);
+               ret = extract_all_images(w, output_dir, flags);
        } else {
                flags &= ~WIMLIB_EXTRACT_FLAG_MULTI_IMAGE;
-               return extract_single_image(w, image, output_dir, flags);
+               ret = extract_single_image(w, image, output_dir, flags);
        }
+       if (num_additional_swms) {
+               free_lookup_table(w->lookup_table);
+               w->lookup_table = w_tab_save;
+       }
+       return ret;
 
 }