* Reads the header from a WIM file.
*
* @wim
- * WIM to read the header from; @wim->in_fd must be positioned at the
- * offset at which to read the header.
+ * WIM to read the header from. @wim->in_fd must be positioned at the
+ * beginning of the file.
*
* @hdr
* Structure to read the header into.
if (ret)
goto read_error;
- if (disk_hdr.magic != WIM_MAGIC) {
- if (disk_hdr.magic == PWM_MAGIC) {
+ hdr->magic = le64_to_cpu(disk_hdr.magic);
+
+ if (hdr->magic != WIM_MAGIC) {
+ if (hdr->magic == PWM_MAGIC) {
/* Pipable WIM: Use header at end instead, unless
* actually reading from a pipe. */
if (!in_fd->is_pipe) {
return WIMLIB_ERR_NOT_A_WIM_FILE;
}
}
- hdr->magic = disk_hdr.magic;
if (le32_to_cpu(disk_hdr.hdr_size) != sizeof(struct wim_header_disk)) {
ERROR("\"%"TS"\": Header size is invalid (%u bytes)",
if (hdr->wim_version != WIM_VERSION_DEFAULT &&
hdr->wim_version != WIM_VERSION_PACKED_STREAMS)
{
- ERROR("\"%"TS"\": Unknown WIM version: %u", hdr->wim_version);
+ ERROR("\"%"TS"\": Unknown WIM version: %u",
+ filename, hdr->wim_version);
return WIMLIB_ERR_UNKNOWN_VERSION;
}
hdr->flags = le32_to_cpu(disk_hdr.wim_flags);
hdr->chunk_size = le32_to_cpu(disk_hdr.chunk_size);
- memcpy(hdr->guid, disk_hdr.guid, WIM_GID_LEN);
+ memcpy(hdr->guid, disk_hdr.guid, WIM_GUID_LEN);
hdr->part_number = le16_to_cpu(disk_hdr.part_number);
hdr->total_parts = le16_to_cpu(disk_hdr.total_parts);
DEBUG("part_number = %u, total_parts = %u, image_count = %u",
hdr->part_number, hdr->total_parts, hdr->image_count);
- if (hdr->image_count >= INT_MAX) {
+ if (unlikely(hdr->image_count > MAX_IMAGES)) {
ERROR("\"%"TS"\": Invalid image count (%u)",
filename, hdr->image_count);
return WIMLIB_ERR_IMAGE_COUNT;
((hdr->magic == PWM_MAGIC) ? "pipable " : ""),
offset);
- disk_hdr.magic = hdr->magic;
+ disk_hdr.magic = cpu_to_le64(hdr->magic);
disk_hdr.hdr_size = cpu_to_le32(sizeof(struct wim_header_disk));
disk_hdr.wim_version = cpu_to_le32(hdr->wim_version);
disk_hdr.wim_flags = cpu_to_le32(hdr->flags);
disk_hdr.chunk_size = cpu_to_le32(hdr->chunk_size);
else
disk_hdr.chunk_size = 0;
- memcpy(disk_hdr.guid, hdr->guid, WIM_GID_LEN);
+ memcpy(disk_hdr.guid, hdr->guid, WIM_GUID_LEN);
disk_hdr.part_number = cpu_to_le16(hdr->part_number);
disk_hdr.total_parts = cpu_to_le16(hdr->total_parts);
WIM_HDR_FLAG_COMPRESS_LZX |
WIM_HDR_FLAG_COMPRESS_RESERVED |
WIM_HDR_FLAG_COMPRESS_XPRESS |
- WIM_HDR_FLAG_COMPRESS_LZMS);
+ WIM_HDR_FLAG_COMPRESS_LZMS |
+ WIM_HDR_FLAG_COMPRESS_XPRESS_2);
switch (ctype) {
case WIMLIB_COMPRESSION_TYPE_NONE:
{
memset(hdr, 0, sizeof(struct wim_header));
hdr->magic = WIM_MAGIC;
- hdr->wim_version = WIM_VERSION_DEFAULT;
+
+ if (ctype == WIMLIB_COMPRESSION_TYPE_LZMS)
+ hdr->wim_version = WIM_VERSION_PACKED_STREAMS;
+ 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;
const char *name;
};
struct hdr_flag hdr_flags[] = {
- {WIM_HDR_FLAG_RESERVED, "RESERVED"},
+ {WIM_HDR_FLAG_RESERVED, "RESERVED"},
{WIM_HDR_FLAG_COMPRESSION, "COMPRESSION"},
{WIM_HDR_FLAG_READONLY, "READONLY"},
{WIM_HDR_FLAG_SPANNED, "SPANNED"},
{WIM_HDR_FLAG_COMPRESS_RESERVED,"COMPRESS_RESERVED"},
{WIM_HDR_FLAG_COMPRESS_LZX, "COMPRESS_LZX"},
{WIM_HDR_FLAG_COMPRESS_XPRESS, "COMPRESS_XPRESS"},
+ {WIM_HDR_FLAG_COMPRESS_LZMS, "COMPRESS_LZMS"},
+ {WIM_HDR_FLAG_COMPRESS_XPRESS_2,"COMPRESS_XPRESS_2"},
};
/* API function documented in wimlib.h */
tprintf(T("Chunk Size = %u\n"), hdr->chunk_size);
tfputs (T("GUID = "), stdout);
- print_byte_field(hdr->guid, WIM_GID_LEN, stdout);
+ print_byte_field(hdr->guid, WIM_GUID_LEN, stdout);
tputchar(T('\n'));
tprintf(T("Part Number = %hu\n"), hdr->part_number);
tprintf(T("Total Parts = %hu\n"), hdr->total_parts);