* 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;
+ WIMStruct *wim;
tchar *swm_base_name;
size_t swm_base_name_len;
const tchar *swm_suffix;
struct list_head lte_list;
int cur_part_number;
int write_flags;
- long size_remaining;
+ s64 size_remaining;
size_t part_size;
wimlib_progress_func_t progress_func;
union wimlib_progress_info progress;
};
static int
-finish_swm(WIMStruct *w, struct list_head *lte_list,
+finish_swm(WIMStruct *wim, struct list_head *lte_list,
int write_flags, wimlib_progress_func_t progress_func)
{
int ret;
- ret = write_lookup_table_from_stream_list(lte_list, w->out_fd,
- &w->hdr.lookup_table_res_entry);
+ ret = write_lookup_table_from_stream_list(lte_list, wim->out_fd,
+ &wim->hdr.lookup_table_res_entry);
if (ret)
return ret;
- return finish_write(w, WIMLIB_ALL_IMAGES,
+ return finish_write(wim, 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;
- WIMStruct *w = args->w;
+ struct split_args *args = (struct split_args*)_args;
+ WIMStruct *wim = args->wim;
int ret;
- /* metadata resources were already written. */
- if (lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)
- return 0;
-
if (args->size_remaining < 0 ||
(u64)args->size_remaining < lte->resource_entry.size) {
/* No space for this resource. Finish the previous swm and
* start a new one. */
- ret = finish_swm(w, &args->lte_list, args->write_flags,
+ ret = finish_swm(wim, &args->lte_list, args->write_flags,
args->progress_func);
if (ret)
return ret;
tsprintf(args->swm_base_name + args->swm_base_name_len, T("%d%"TS),
args->cur_part_number, args->swm_suffix);
- w->hdr.part_number = args->cur_part_number;
+ wim->hdr.part_number = args->cur_part_number;
if (args->progress_func) {
args->progress.split.cur_part_number = args->cur_part_number;
&args->progress);
}
- ret = begin_write(w, args->swm_base_name, args->write_flags);
+ ret = begin_write(wim, args->swm_base_name, args->write_flags);
if (ret)
return ret;
args->size_remaining = args->part_size;
args->size_remaining -= lte->resource_entry.size;
args->progress.split.completed_bytes += lte->resource_entry.size;
list_add_tail(<e->swm_stream_list, &args->lte_list);
- return copy_resource(lte, w);
+ return copy_resource(lte, wim);
}
-/* Splits the WIM file @w into multiple parts prefixed by @swm_name with size at
- * most @part_size bytes. */
+/* Splits the WIM file @wim into multiple parts prefixed by @swm_name with size
+ * at most @part_size bytes. */
WIMLIBAPI int
-wimlib_split(WIMStruct *w, const tchar *swm_name,
+wimlib_split(WIMStruct *wim, const tchar *swm_name,
size_t part_size, int write_flags,
wimlib_progress_func_t progress_func)
{
if (!swm_name || part_size == 0)
return WIMLIB_ERR_INVALID_PARAM;
- if (w->hdr.total_parts != 1)
+ if (wim->hdr.total_parts != 1)
return WIMLIB_ERR_SPLIT_UNSUPPORTED;
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];
- memcpy(&hdr_save, &w->hdr, sizeof(struct wim_header));
- w->hdr.flags |= WIM_HDR_FLAG_SPANNED;
- w->hdr.boot_idx = 0;
- randomize_byte_array(w->hdr.guid, WIM_GID_LEN);
- ret = begin_write(w, swm_name, write_flags);
+ memcpy(&hdr_save, &wim->hdr, sizeof(struct wim_header));
+ wim->hdr.flags |= WIM_HDR_FLAG_SPANNED;
+ wim->hdr.boot_idx = 0;
+ randomize_byte_array(wim->hdr.guid, WIM_GID_LEN);
+ ret = begin_write(wim, swm_name, write_flags);
if (ret)
goto out;
swm_suffix = &swm_base_name[ARRAY_LEN(swm_base_name) - 1];
}
- args.w = w;
+ args.wim = wim;
args.swm_base_name = swm_base_name;
args.swm_base_name_len = swm_base_name_len;
args.swm_suffix = swm_suffix;
args.size_remaining = part_size;
args.part_size = part_size;
args.progress_func = progress_func;
- args.progress.split.total_bytes = lookup_table_total_stream_size(w->lookup_table);
+ args.progress.split.total_bytes = lookup_table_total_stream_size(wim->lookup_table);
args.progress.split.cur_part_number = 1;
args.progress.split.completed_bytes = 0;
args.progress.split.part_name = swm_base_name;
&args.progress);
}
- for (int i = 0; i < w->hdr.image_count; i++) {
+ for (int i = 0; i < wim->hdr.image_count; i++) {
struct wim_lookup_table_entry *metadata_lte;
- metadata_lte = w->image_metadata[i]->metadata_lte;
- ret = copy_resource(metadata_lte, w);
+ metadata_lte = wim->image_metadata[i]->metadata_lte;
+ ret = copy_resource(metadata_lte, wim);
if (ret)
goto out;
args.size_remaining -= metadata_lte->resource_entry.size;
list_add_tail(&metadata_lte->swm_stream_list, &args.lte_list);
}
- ret = for_lookup_table_entry_pos_sorted(w->lookup_table,
+ ret = for_lookup_table_entry_pos_sorted(wim->lookup_table,
copy_resource_to_swm,
&args);
if (ret)
goto out;
- ret = finish_swm(w, &args.lte_list, write_flags, progress_func);
+ ret = finish_swm(wim, &args.lte_list, write_flags, progress_func);
if (ret)
goto out;
int total_parts = args.cur_part_number;
for (int i = 1; i <= total_parts; i++) {
const tchar *part_name;
+ int part_fd;
+ int ret2;
+
if (i == 1) {
part_name = swm_name;
} else {
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));
+ close_wim_writable(wim);
+ memcpy(&wim->hdr, &hdr_save, sizeof(struct wim_header));
return ret;
}
git://wimlib.net / wimlib / blobdiff