X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fheader.c;h=f52c72b7562a852e36b09e9a350dcd00316558e2;hb=74d4d4b70eda3ab6e5f30e9d8c019034ce8fba15;hp=d3ab360cd3502b4c641b153c62e5da992bc6c1da;hpb=f24f8409b041727329e980fdc81e84a7c9b00e5b;p=wimlib

diff --git a/src/header.c b/src/header.c
index d3ab360c..f52c72b7 100644
--- a/src/header.c
+++ b/src/header.c
@@ -89,8 +89,10 @@ 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) {
@@ -104,7 +106,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,7 +115,7 @@ 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_PACKED_STREAMS)
 	{
 		ERROR("\"%"TS"\": Unknown WIM version: %u", hdr->wim_version);
 		return WIMLIB_ERR_UNKNOWN_VERSION;
@@ -171,7 +172,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);
@@ -225,7 +226,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:
@@ -239,6 +241,10 @@ set_wim_hdr_cflags(int ctype, struct wim_header *hdr)
 		hdr->flags |= WIM_HDR_FLAG_COMPRESSION | WIM_HDR_FLAG_COMPRESS_XPRESS;
 		return 0;
 
+	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;
 	}
@@ -252,7 +258,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_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;
@@ -269,7 +279,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"},
@@ -280,6 +290,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  */