X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fheader.c;h=634f4dab8cd8275db3e3fcd202f051f00f173afc;hb=2c6340d0ccb0710950b0acdc3bde04179f6e0f28;hp=feea7c68c0b6ecc4418976ada0782246e41d2e13;hpb=3ffb2cde078ae8f62d542ab89166e1059c13d758;p=wimlib diff --git a/src/header.c b/src/header.c index feea7c68..634f4dab 100644 --- a/src/header.c +++ b/src/header.c @@ -7,27 +7,30 @@ /* * Copyright (C) 2012, 2013 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 # include "config.h" #endif +#include +#include +#include + #include "wimlib.h" +#include "wimlib/alloca.h" #include "wimlib/assert.h" #include "wimlib/endianness.h" #include "wimlib/error.h" @@ -36,21 +39,12 @@ #include "wimlib/util.h" #include "wimlib/wim.h" -#include -#include -#include -#ifdef HAVE_ALLOCA_H -# include -#else -# include -#endif - /* * 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. @@ -89,12 +83,16 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr) 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) { - lseek(in_fd->fd, -WIM_HEADER_DISK_SIZE, SEEK_END); + ret = WIMLIB_ERR_READ; + if (-1 == lseek(in_fd->fd, -WIM_HEADER_DISK_SIZE, SEEK_END)) + goto read_error; ret = full_read(in_fd, &disk_hdr, sizeof(disk_hdr)); if (ret) goto read_error; @@ -104,7 +102,6 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr) 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)", @@ -114,15 +111,16 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr) hdr->wim_version = le32_to_cpu(disk_hdr.wim_version); if (hdr->wim_version != WIM_VERSION_DEFAULT && - hdr->wim_version != WIM_VERSION_STREAM_CONCAT) + hdr->wim_version != WIM_VERSION_SOLID) { - 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); @@ -139,7 +137,7 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr) 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; @@ -171,7 +169,7 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd, ((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); @@ -179,7 +177,7 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd, 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); @@ -225,7 +223,8 @@ set_wim_hdr_cflags(int ctype, struct wim_header *hdr) 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: @@ -256,7 +255,11 @@ init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size) { 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_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; @@ -273,7 +276,7 @@ struct hdr_flag { 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"}, @@ -284,6 +287,8 @@ struct hdr_flag hdr_flags[] = { {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 */ @@ -303,7 +308,7 @@ wimlib_print_header(const WIMStruct *wim) 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);