X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fheader.c;h=634f4dab8cd8275db3e3fcd202f051f00f173afc;hb=2c6340d0ccb0710950b0acdc3bde04179f6e0f28;hp=f52c72b7562a852e36b09e9a350dcd00316558e2;hpb=86a852652706cfe53087ef839840171bed597ffd;p=wimlib

diff --git a/src/header.c b/src/header.c
index f52c72b7..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 <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"
@@ -36,21 +39,12 @@
 #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.
  *
  * @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.
@@ -96,7 +90,9 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 			/* 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;
@@ -115,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_PACKED_STREAMS)
+	    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);
 
@@ -140,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;
@@ -180,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);
@@ -260,7 +257,7 @@ init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size)
 	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)) {
@@ -311,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);