X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fheader.c;h=cf19396317ca3af6da227c6b4b60d1bd180b4b06;hp=613256fa022059331cd5f2ec338b85df5e75d69f;hb=5ec910e4e9126a37eed1ff199d55a1952c76e0f7;hpb=f18b7fc3361c4daac0ddd104af65a8eff8466fec diff --git a/src/header.c b/src/header.c index 613256fa..cf193963 100644 --- a/src/header.c +++ b/src/header.c @@ -1,11 +1,11 @@ /* * header.c * - * Read, write, or create a WIM header. + * Read, write, or print a WIM header. */ /* - * Copyright (C) 2012, 2013 Eric Biggers + * Copyright (C) 2012, 2013, 2015 Eric Biggers * * 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 @@ -25,6 +25,7 @@ # include "config.h" #endif +#include #include #include #include @@ -75,9 +76,7 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr) filename = pipe_str; } - BUILD_BUG_ON(sizeof(struct wim_header_disk) != WIM_HEADER_DISK_SIZE); - - DEBUG("Reading WIM header from \"%"TS"\"", filename); + STATIC_ASSERT(sizeof(struct wim_header_disk) == WIM_HEADER_DISK_SIZE); ret = full_read(in_fd, &disk_hdr, sizeof(disk_hdr)); if (ret) @@ -111,7 +110,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_PACKED_STREAMS) + hdr->wim_version != WIM_VERSION_SOLID) { ERROR("\"%"TS"\": Unknown WIM version: %u", filename, hdr->wim_version); @@ -120,7 +119,7 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr) 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_GUID_LEN); + copy_guid(hdr->guid, disk_hdr.guid); hdr->part_number = le16_to_cpu(disk_hdr.part_number); hdr->total_parts = le16_to_cpu(disk_hdr.total_parts); @@ -134,16 +133,13 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr) hdr->image_count = le32_to_cpu(disk_hdr.image_count); - DEBUG("part_number = %u, total_parts = %u, image_count = %u", - hdr->part_number, hdr->total_parts, hdr->image_count); - if (unlikely(hdr->image_count > MAX_IMAGES)) { ERROR("\"%"TS"\": Invalid image count (%u)", filename, hdr->image_count); 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); @@ -159,30 +155,22 @@ read_error: * specified is the current one, the position is advanced by the size of the * header. */ int -write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd, - off_t offset) +write_wim_header(const struct wim_header *hdr, struct filedes *out_fd, + off_t offset) { struct wim_header_disk disk_hdr _aligned_attribute(8); int ret; - DEBUG("Writing %sWIM header at offset %"PRIu64, - ((hdr->magic == PWM_MAGIC) ? "pipable " : ""), - offset); - 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); - if (hdr->flags & WIM_HDR_FLAG_COMPRESSION) - disk_hdr.chunk_size = cpu_to_le32(hdr->chunk_size); - else - disk_hdr.chunk_size = 0; - memcpy(disk_hdr.guid, hdr->guid, WIM_GUID_LEN); - + disk_hdr.chunk_size = cpu_to_le32(hdr->chunk_size); + copy_guid(disk_hdr.guid, hdr->guid); 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); @@ -198,14 +186,6 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd, return ret; } -/* Writes the header for a WIM file at the output file descriptor's current - * offset. */ -int -write_wim_header(const struct wim_header *hdr, struct filedes *out_fd) -{ - return write_wim_header_at_offset(hdr, out_fd, out_fd->offset); -} - /* Update just the wim_flags field. */ int write_wim_header_flags(u32 hdr_flags, struct filedes *out_fd) @@ -216,66 +196,10 @@ write_wim_header_flags(u32 hdr_flags, struct filedes *out_fd) offsetof(struct wim_header_disk, wim_flags)); } -int -set_wim_hdr_cflags(int 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_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; - - case WIMLIB_COMPRESSION_TYPE_XPRESS: - 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; - } -} - -/* - * Initializes the header for a WIM file. - */ -int -init_wim_header(struct wim_header *hdr, int 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; - 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; - } - 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"}, @@ -297,7 +221,15 @@ wimlib_print_header(const WIMStruct *wim) { const struct wim_header *hdr = &wim->hdr; - tprintf(T("Magic Characters = MSWIM\\000\\000\\000\n")); + tprintf(T("Magic Characters = ")); + for (int i = 0; i < sizeof(hdr->magic); i++) { + tchar c = (u8)(hdr->magic >> ((8 * i))); + if (istalpha(c)) + tputchar(c); + else + tprintf(T("\\%o"), c); + } + tputchar(T('\n')); tprintf(T("Header Size = %u\n"), WIM_HEADER_DISK_SIZE); tprintf(T("Version = 0x%x\n"), hdr->wim_version); @@ -308,19 +240,19 @@ 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_GUID_LEN, stdout); + print_byte_field(hdr->guid, GUID_SIZE, stdout); tputchar(T('\n')); 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"),