Fix setting header flag during overwrite

[wimlib] / src / split.c

diff --git a/src/split.c b/src/split.c
index eb8f3484936364edfc9b68b9b33f2793c953239b..25ca3cdb0ddc3747fd60627ab321342e0c57f838 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -23,10 +23,22 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "lookup_table.h"
-#include "xml.h"
-#include "buffer_io.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/endianness.h"
+#include "wimlib/error.h"
+#include "wimlib/file_io.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/types.h"
+#include "wimlib/write.h"
+#include "wimlib/list.h"
+
+#include <fcntl.h> /* for open() */
+#include <unistd.h> /* for close() */
 
 struct split_args {
        WIMStruct *w;
@@ -46,35 +58,21 @@ static int
 finish_swm(WIMStruct *w, struct list_head *lte_list,
           int write_flags, wimlib_progress_func_t progress_func)
 {
-       off_t lookup_table_offset = ftello(w->out_fp);
        int ret;
-       struct wim_lookup_table_entry *lte;
 
-       list_for_each_entry(lte, lte_list, swm_stream_list) {
-               ret = write_lookup_table_entry(lte, w->out_fp);
-               if (ret)
-                       return ret;
-       }
-
-       off_t xml_data_offset = ftello(w->out_fp);
-
-       if (lookup_table_offset == -1 || xml_data_offset == -1)
-               return WIMLIB_ERR_WRITE;
-       w->hdr.lookup_table_res_entry.offset = lookup_table_offset;
-       w->hdr.lookup_table_res_entry.size =
-                               xml_data_offset - lookup_table_offset;
-       w->hdr.lookup_table_res_entry.original_size =
-                               xml_data_offset - lookup_table_offset;
-       w->hdr.lookup_table_res_entry.flags = WIM_RESHDR_FLAG_METADATA;
+       ret = write_lookup_table_from_stream_list(lte_list, w->out_fd,
+                                                 &w->hdr.lookup_table_res_entry);
+       if (ret)
+               return ret;
        return finish_write(w, WIMLIB_ALL_IMAGES,
                            write_flags | WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE,
                            progress_func);
 }
 
 static int
-copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *__args)
+copy_resource_to_swm(struct wim_lookup_table_entry *lte, void *_args)
 {
-       struct split_args *args = (struct split_args*)__args;
+       struct split_args *args = (struct split_args*)_args;
        WIMStruct *w = args->w;
        int ret;
 
@@ -145,10 +143,6 @@ wimlib_split(WIMStruct *w, const tchar *swm_name,
 
        write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
 
-       ret = wim_checksum_unhashed_streams(w);
-       if (ret)
-               return ret;
-
        swm_name_len = tstrlen(swm_name);
        tchar swm_base_name[swm_name_len + 20];
 
@@ -225,6 +219,11 @@ wimlib_split(WIMStruct *w, const tchar *swm_name,
        int total_parts = args.cur_part_number;
        for (int i = 1; i <= total_parts; i++) {
                const tchar *part_name;
+               int part_fd;
+               le16 part_data[2];
+               size_t bytes_written;
+               int ret2;
+
                if (i == 1) {
                        part_name = swm_name;
                } else {
@@ -233,26 +232,24 @@ wimlib_split(WIMStruct *w, const tchar *swm_name,
                        part_name = swm_base_name;
                }
 
-               FILE *fp = tfopen(part_name, T("r+b"));
-               if (!fp) {
+               part_fd = topen(part_name, O_WRONLY | O_BINARY);
+               if (part_fd == -1) {
                        ERROR_WITH_ERRNO("Failed to open `%"TS"'", part_name);
                        ret = WIMLIB_ERR_OPEN;
                        goto out;
                }
-               u8 buf[4];
-               put_u16(&buf[0], i);
-               put_u16(&buf[2], total_parts);
-
-               if (fseek(fp, 40, SEEK_SET) != 0 ||
-                   fwrite(buf, 1, sizeof(buf), fp) != sizeof(buf) ||
-                   fclose(fp) != 0)
-               {
-                       ERROR_WITH_ERRNO("Error overwriting header of `%"TS"'",
-                                        part_name);
+
+               ret = write_header_part_data(i, total_parts, part_fd);
+               ret2 = close(part_fd);
+               if (ret == 0 && ret2 != 0)
                        ret = WIMLIB_ERR_WRITE;
-                       break;
+               if (ret) {
+                       ERROR_WITH_ERRNO("Error updating header of `%"TS"'",
+                                        part_name);
+                       goto out;
                }
        }
+       ret = 0;
 out:
        close_wim_writable(w);
        memcpy(&w->hdr, &hdr_save, sizeof(struct wim_header));