# include "config.h"
#endif
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
#include "wimlib.h"
+#include "wimlib/alloca.h"
#include "wimlib/assert.h"
#include "wimlib/endianness.h"
#include "wimlib/error.h"
#include "wimlib/util.h"
#include "wimlib/wim.h"
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#else
-# include <stdlib.h>
-#endif
-
/*
* Reads the header from a WIM file.
*
hdr->wim_version = le32_to_cpu(disk_hdr.wim_version);
if (hdr->wim_version != WIM_VERSION_DEFAULT &&
- hdr->wim_version != WIM_VERSION_PACKED_STREAMS)
+ hdr->wim_version != WIM_VERSION_SOLID)
{
ERROR("\"%"TS"\": Unknown WIM version: %u",
filename, hdr->wim_version);
return WIMLIB_ERR_IMAGE_COUNT;
}
- get_wim_reshdr(&disk_hdr.lookup_table_reshdr, &hdr->lookup_table_reshdr);
+ get_wim_reshdr(&disk_hdr.blob_table_reshdr, &hdr->blob_table_reshdr);
get_wim_reshdr(&disk_hdr.xml_data_reshdr, &hdr->xml_data_reshdr);
get_wim_reshdr(&disk_hdr.boot_metadata_reshdr, &hdr->boot_metadata_reshdr);
hdr->boot_idx = le32_to_cpu(disk_hdr.boot_idx);
disk_hdr.part_number = cpu_to_le16(hdr->part_number);
disk_hdr.total_parts = cpu_to_le16(hdr->total_parts);
disk_hdr.image_count = cpu_to_le32(hdr->image_count);
- put_wim_reshdr(&hdr->lookup_table_reshdr, &disk_hdr.lookup_table_reshdr);
+ put_wim_reshdr(&hdr->blob_table_reshdr, &disk_hdr.blob_table_reshdr);
put_wim_reshdr(&hdr->xml_data_reshdr, &disk_hdr.xml_data_reshdr);
put_wim_reshdr(&hdr->boot_metadata_reshdr, &disk_hdr.boot_metadata_reshdr);
disk_hdr.boot_idx = cpu_to_le32(hdr->boot_idx);
offsetof(struct wim_header_disk, wim_flags));
}
-int
-set_wim_hdr_cflags(int ctype, struct wim_header *hdr)
+void
+set_wim_hdr_cflags(enum wimlib_compression_type ctype, struct wim_header *hdr)
{
hdr->flags &= ~(WIM_HDR_FLAG_COMPRESSION |
- WIM_HDR_FLAG_COMPRESS_LZX |
WIM_HDR_FLAG_COMPRESS_RESERVED |
WIM_HDR_FLAG_COMPRESS_XPRESS |
+ WIM_HDR_FLAG_COMPRESS_LZX |
WIM_HDR_FLAG_COMPRESS_LZMS |
WIM_HDR_FLAG_COMPRESS_XPRESS_2);
switch (ctype) {
-
case WIMLIB_COMPRESSION_TYPE_NONE:
- return 0;
-
- case WIMLIB_COMPRESSION_TYPE_LZX:
- hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_LZX;
- return 0;
-
+ return;
case WIMLIB_COMPRESSION_TYPE_XPRESS:
hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_XPRESS;
- return 0;
-
+ return;
+ case WIMLIB_COMPRESSION_TYPE_LZX:
+ hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_LZX;
+ return;
case WIMLIB_COMPRESSION_TYPE_LZMS:
hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_LZMS;
- return 0;
-
- default:
- return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
+ return;
}
+ wimlib_assert(0);
}
-/*
- * Initializes the header for a WIM file.
- */
-int
-init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size)
+/* Initialize the header for a WIM file. */
+void
+init_wim_header(struct wim_header *hdr,
+ enum wimlib_compression_type ctype, u32 chunk_size)
{
memset(hdr, 0, sizeof(struct wim_header));
hdr->magic = WIM_MAGIC;
-
if (ctype == WIMLIB_COMPRESSION_TYPE_LZMS)
- hdr->wim_version = WIM_VERSION_PACKED_STREAMS;
+ hdr->wim_version = WIM_VERSION_SOLID;
else
hdr->wim_version = WIM_VERSION_DEFAULT;
- if (set_wim_hdr_cflags(ctype, hdr)) {
- ERROR("Invalid compression type specified (%d)", ctype);
- return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
- }
+ set_wim_hdr_cflags(ctype, hdr);
hdr->chunk_size = chunk_size;
hdr->total_parts = 1;
hdr->part_number = 1;
randomize_byte_array(hdr->guid, sizeof(hdr->guid));
- return 0;
}
-struct hdr_flag {
+static const struct {
u32 flag;
const char *name;
-};
-struct hdr_flag hdr_flags[] = {
+} hdr_flags[] = {
{WIM_HDR_FLAG_RESERVED, "RESERVED"},
{WIM_HDR_FLAG_COMPRESSION, "COMPRESSION"},
{WIM_HDR_FLAG_READONLY, "READONLY"},
tprintf(T("Part Number = %hu\n"), hdr->part_number);
tprintf(T("Total Parts = %hu\n"), hdr->total_parts);
tprintf(T("Image Count = %u\n"), hdr->image_count);
- tprintf(T("Lookup Table Size = %"PRIu64"\n"),
- (u64)hdr->lookup_table_reshdr.size_in_wim);
- tprintf(T("Lookup Table Flags = 0x%hhx\n"),
- (u8)hdr->lookup_table_reshdr.flags);
- tprintf(T("Lookup Table Offset = %"PRIu64"\n"),
- hdr->lookup_table_reshdr.offset_in_wim);
- tprintf(T("Lookup Table Original_size = %"PRIu64"\n"),
- hdr->lookup_table_reshdr.uncompressed_size);
+ tprintf(T("Blob Table Size = %"PRIu64"\n"),
+ (u64)hdr->blob_table_reshdr.size_in_wim);
+ tprintf(T("Blob Table Flags = 0x%hhx\n"),
+ (u8)hdr->blob_table_reshdr.flags);
+ tprintf(T("Blob Table Offset = %"PRIu64"\n"),
+ hdr->blob_table_reshdr.offset_in_wim);
+ tprintf(T("Blob Table Original_size = %"PRIu64"\n"),
+ hdr->blob_table_reshdr.uncompressed_size);
tprintf(T("XML Data Size = %"PRIu64"\n"),
(u64)hdr->xml_data_reshdr.size_in_wim);
tprintf(T("XML Data Flags = 0x%hhx\n"),