WIMBoot / system compression: try WOFADK in addition to WOF

[wimlib] / src / add_image.c

diff --git a/src/add_image.c b/src/add_image.c
index a544c7b8d6ca032449b1ab24b2b85d17ebbc05ef..e2106c9ba5fa8ba8cd7f8952ed956d1d1c15265b 100644 (file)
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -5,20 +5,18 @@
 /*
  * Copyright (C) 2012, 2013, 2014 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file 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 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * 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 General Public License for more
+ * This file 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
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -26,8 +24,8 @@
 #endif
 
 #include "wimlib.h"
+#include "wimlib/blob_table.h"
 #include "wimlib/error.h"
-#include "wimlib/lookup_table.h"
 #include "wimlib/metadata.h"
 #include "wimlib/security.h"
 #include "wimlib/xml.h"
@@ -40,24 +38,24 @@ static int
 add_empty_image_metadata(WIMStruct *wim)
 {
        int ret;
-       struct wim_lookup_table_entry *metadata_lte;
+       struct blob_descriptor *metadata_blob;
        struct wim_security_data *sd;
        struct wim_image_metadata *imd;
 
-       /* Create lookup table entry for this metadata resource (for now really
-        * just a dummy entry).  */
+       /* Create a blob descriptor for the new metadata resource.  */
        ret = WIMLIB_ERR_NOMEM;
-       metadata_lte = new_lookup_table_entry();
-       if (!metadata_lte)
+       metadata_blob = new_blob_descriptor();
+       if (!metadata_blob)
                goto out;
 
-       metadata_lte->flags = WIM_RESHDR_FLAG_METADATA;
-       metadata_lte->unhashed = 1;
+       metadata_blob->refcnt = 1;
+       metadata_blob->unhashed = 1;
+       metadata_blob->is_metadata = 1;
 
        /* Create empty security data (no security descriptors).  */
        sd = new_wim_security_data();
        if (!sd)
-               goto out_free_metadata_lte;
+               goto out_free_metadata_blob;
 
        imd = new_image_metadata();
        if (!imd)
@@ -66,7 +64,7 @@ add_empty_image_metadata(WIMStruct *wim)
        /* A NULL root_dentry indicates a completely empty image, without even a
         * root directory.  */
        imd->root_dentry = NULL;
-       imd->metadata_lte = metadata_lte;
+       imd->metadata_blob = metadata_blob;
        imd->security_data = sd;
        imd->modified = 1;
 
@@ -78,8 +76,8 @@ add_empty_image_metadata(WIMStruct *wim)
 
 out_free_security_data:
        free_wim_security_data(sd);
-out_free_metadata_lte:
-       free_lookup_table_entry(metadata_lte);
+out_free_metadata_blob:
+       free_blob_descriptor(metadata_blob);
 out:
        return ret;
 }
@@ -90,10 +88,6 @@ wimlib_add_empty_image(WIMStruct *wim, const tchar *name, int *new_idx_ret)
 {
        int ret;
 
-       ret = can_modify_wim(wim);
-       if (ret)
-               return ret;
-
        if (!name)
                name = T("");
 
@@ -157,8 +151,7 @@ wimlib_add_image_multisource(WIMStruct *wim,
                             size_t num_sources,
                             const tchar *name,
                             const tchar *config_file,
-                            int add_flags,
-                            wimlib_progress_func_t progress_func)
+                            int add_flags)
 {
        int ret;
        struct wimlib_update_command *add_cmds;
@@ -182,7 +175,7 @@ wimlib_add_image_multisource(WIMStruct *wim,
 
        /* Delegate the work to wimlib_update_image().  */
        ret = wimlib_update_image(wim, wim->hdr.image_count, add_cmds,
-                                 num_sources, 0, progress_func);
+                                 num_sources, 0);
        FREE(add_cmds);
        if (ret)
                goto out_delete_image;
@@ -198,14 +191,8 @@ wimlib_add_image_multisource(WIMStruct *wim,
        return 0;
 
 out_delete_image:
-       /* Unsuccessful; rollback the WIM to its original state.  */
-
-       /* wimlib_update_image() is now all-or-nothing, so no dentries remain
-        * and there's no need to pass the lookup table here.  */
-       put_image_metadata(wim->image_metadata[wim->hdr.image_count - 1], NULL);
-
-       xml_delete_image(&wim->wim_info, wim->hdr.image_count);
-       wim->hdr.image_count--;
+       /* Unsuccessful; rollback by removing the new image.  */
+       delete_wim_image(wim, wim->hdr.image_count);
        return ret;
 }
 
@@ -215,8 +202,7 @@ wimlib_add_image(WIMStruct *wim,
                 const tchar *source,
                 const tchar *name,
                 const tchar *config_file,
-                int add_flags,
-                wimlib_progress_func_t progress_func)
+                int add_flags)
 {
        /* Use the more general wimlib_add_image_multisource().  */
        const struct wimlib_capture_source capture_src = {
@@ -225,6 +211,5 @@ wimlib_add_image(WIMStruct *wim,
                .reserved = 0,
        };
        return wimlib_add_image_multisource(wim, &capture_src, 1, name,
-                                           config_file, add_flags,
-                                           progress_func);
+                                           config_file, add_flags);
 }