]> wimlib.net Git - wimlib/blobdiff - src/header.c
filedes_t => int
[wimlib] / src / header.c
index 2a7fe32b5fbaac0318b83d6937b5c2349dcd0d91..70abf2f27dee701dcdb97c71556f135b9607df66 100644 (file)
@@ -5,8 +5,7 @@
  */
 
 /*
- * Copyright (C) 2010 Carl Thijssen
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
  */
 
 #include "wimlib_internal.h"
-#include "io.h"
+#include "buffer_io.h"
+#include <limits.h>
 
 /* First 8 bytes in every WIM file. */
 static const u8 wim_magic_chars[WIM_MAGIC_LEN] = {
                        'M', 'S', 'W', 'I', 'M', '\0', '\0', '\0' };
 
-/* Reads the header for a WIM file.  */
-int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
+/* Reads the header from a WIM file.  */
+int
+read_header(int in_fd, struct wim_header *hdr, int open_flags)
 {
        size_t bytes_read;
        u8 buf[WIM_HEADER_DISK_SIZE];
-       size_t hdr_rem_size;
-       const u8 *p;
+       const void *p;
 
        u32 hdr_size;
        u32 wim_version;
@@ -45,43 +45,29 @@ int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
 
        DEBUG("Reading WIM header.");
 
-       bytes_read = fread(buf, 1, WIM_MAGIC_LEN, fp);
+       bytes_read = full_pread(in_fd, buf, WIM_HEADER_DISK_SIZE, 0);
 
-       if (bytes_read != WIM_MAGIC_LEN)
-               goto err;
-
-       /* Byte 8 */
+       if (bytes_read != WIM_HEADER_DISK_SIZE) {
+               ERROR_WITH_ERRNO("Error reading WIM header");
+               return WIMLIB_ERR_READ;
+       }
 
-       if (memcmp(buf, wim_magic_chars, WIM_MAGIC_LEN) != 0) {
+       p = buf;
+       if (memcmp(p, wim_magic_chars, WIM_MAGIC_LEN)) {
                ERROR("Invalid magic characters in WIM header");
                return WIMLIB_ERR_NOT_A_WIM_FILE;
        }
 
-       bytes_read = fread(&hdr_size, 1, sizeof(u32), fp);
-       if (bytes_read != sizeof(u32))
-               goto err;
-
-       hdr_size = le32_to_cpu(hdr_size);
-
-       /* Byte 12 */
-
+       /* Byte 8 */
+       p = get_u32(p + 8, &hdr_size);
        if (hdr_size != WIM_HEADER_DISK_SIZE) {
                ERROR("Header is %u bytes (expected %u bytes)",
                      hdr_size, WIM_HEADER_DISK_SIZE);
                return WIMLIB_ERR_INVALID_HEADER_SIZE;
        }
 
-       /* Read the rest of the header into a buffer. */
-
-       hdr_rem_size = WIM_HEADER_DISK_SIZE - WIM_MAGIC_LEN - sizeof(u32);
-
-       bytes_read = fread(buf + WIM_MAGIC_LEN + sizeof(u32), 1,
-                          hdr_rem_size, fp);
-       if (bytes_read != hdr_rem_size)
-               goto err;
-
+       /* Byte 12 */
        p = get_u32(buf + WIM_MAGIC_LEN + sizeof(u32), &wim_version);
-
        if (wim_version != WIM_VERSION) {
                ERROR("The WIM header says the WIM version is %u, but wimlib "
                      "only knows about version %u",
@@ -104,8 +90,17 @@ int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
        p = get_u16(p, &hdr->part_number);
        p = get_u16(p, &hdr->total_parts);
 
-       if (!(open_flags & WIMLIB_OPEN_FLAG_SPLIT_OK)
-           && (hdr->part_number != 1 || hdr->total_parts != 1))
+       if (hdr->total_parts == 0 ||
+           hdr->part_number == 0 ||
+           hdr->part_number > hdr->total_parts)
+       {
+               ERROR("Invalid WIM part number: %hu of %hu",
+                     hdr->part_number, hdr->total_parts);
+               return WIMLIB_ERR_INVALID_PART_NUMBER;
+       }
+
+       if (!(open_flags & WIMLIB_OPEN_FLAG_SPLIT_OK) &&
+           hdr->total_parts != 1)
        {
                ERROR("This WIM is part %u of a %u-part WIM",
                      hdr->part_number, hdr->total_parts);
@@ -117,6 +112,11 @@ int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
        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) {
+               ERROR("Invalid image count (%u)", hdr->image_count);
+               return WIMLIB_ERR_IMAGE_COUNT;
+       }
+
        /* Byte 48 */
 
        p = get_resource_entry(p, &hdr->lookup_table_res_entry);
@@ -138,24 +138,18 @@ int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
        /* Byte 208 */
 
        return 0;
-
-err:
-       if (feof(fp))
-               ERROR("Unexpected EOF while reading WIM header");
-       else
-               ERROR_WITH_ERRNO("Error reading WIM header");
-       return WIMLIB_ERR_READ;
 }
 
 /*
  * Writes the header for a WIM file.
  *
  * @hdr:       A pointer to a struct wim_header structure that describes the header.
- * @out:       The FILE* for the output file, positioned at the appropriate
- *             place (the beginning of the file).
- * @return:    Zero on success, nonzero on failure.
+ * @out_fd:    The file descriptor to the WIM file, opened for writing.
+ * 
+ * Returns zero on success, nonzero on failure.
  */
-int write_header(const struct wim_header *hdr, FILE *out_fp)
+int
+write_header(const struct wim_header *hdr, int out_fd)
 {
        u8 buf[WIM_HEADER_DISK_SIZE];
        u8 *p;
@@ -167,12 +161,12 @@ int write_header(const struct wim_header *hdr, FILE *out_fp)
        p = put_u32(p, hdr->flags);
        p = put_u32(p, (hdr->flags & WIM_HDR_FLAG_COMPRESSION) ?
                                WIM_CHUNK_SIZE : 0);
-       /* byte 24 */
+       /* Byte 24 */
 
        p = put_bytes(p, WIM_GID_LEN, hdr->guid);
        p = put_u16(p, hdr->part_number);
 
-       /* byte 40 */
+       /* Byte 40 */
 
        p = put_u16(p, hdr->total_parts);
        p = put_u32(p, hdr->image_count);
@@ -181,8 +175,10 @@ int write_header(const struct wim_header *hdr, FILE *out_fp)
        p = put_resource_entry(p, &hdr->boot_metadata_res_entry);
        p = put_u32(p, hdr->boot_idx);
        p = put_resource_entry(p, &hdr->integrity);
-       memset(p, 0, WIM_UNUSED_LEN);
-       if (fwrite(buf, 1, sizeof(buf), out_fp) != sizeof(buf)) {
+       p = put_zeroes(p, WIM_UNUSED_LEN);
+       wimlib_assert(p - buf == sizeof(buf));
+
+       if (full_pwrite(out_fd, buf, sizeof(buf), 0) != sizeof(buf)) {
                ERROR_WITH_ERRNO("Failed to write WIM header");
                return WIMLIB_ERR_WRITE;
        }
@@ -193,7 +189,8 @@ int write_header(const struct wim_header *hdr, FILE *out_fp)
 /*
  * Initializes the header for a WIM file.
  */
-int init_header(struct wim_header *hdr, int ctype)
+int
+init_header(struct wim_header *hdr, int ctype)
 {
        memset(hdr, 0, sizeof(struct wim_header));
        switch (ctype) {
@@ -237,58 +234,58 @@ struct hdr_flag hdr_flags[] = {
 };
 
 /* Prints information from the header of the WIM file associated with @w. */
-WIMLIBAPI void wimlib_print_header(const WIMStruct *w)
+WIMLIBAPI void
+wimlib_print_header(const WIMStruct *w)
 {
        const struct wim_header *hdr = &w->hdr;
-       uint i;
 
-       printf("Magic Characters            = MSWIM\\000\\000\\000\n");
-       printf("Header Size                 = %u\n", WIM_HEADER_DISK_SIZE);
-       printf("Version                     = 0x%x\n", WIM_VERSION);
+       tprintf(T("Magic Characters            = MSWIM\\000\\000\\000\n"));
+       tprintf(T("Header Size                 = %u\n"), WIM_HEADER_DISK_SIZE);
+       tprintf(T("Version                     = 0x%x\n"), WIM_VERSION);
 
-       printf("Flags                       = 0x%x\n", hdr->flags);
-       for (i = 0; i < ARRAY_LEN(hdr_flags); i++)
+       tprintf(T("Flags                       = 0x%x\n"), hdr->flags);
+       for (size_t i = 0; i < ARRAY_LEN(hdr_flags); i++)
                if (hdr_flags[i].flag & hdr->flags)
-                       printf("    WIM_HDR_FLAG_%s is set\n", hdr_flags[i].name);
-
-       printf("Chunk Size                  = %u\n", WIM_CHUNK_SIZE);
-       fputs ("GUID                        = ", stdout);
-       print_byte_field(hdr->guid, WIM_GID_LEN);
-       putchar('\n');
-       printf("Part Number                 = %hu\n", w->hdr.part_number);
-       printf("Total Parts                 = %hu\n", w->hdr.total_parts);
-       printf("Image Count                 = %u\n", hdr->image_count);
-       printf("Lookup Table Size           = %"PRIu64"\n",
+                       tprintf(T("    WIM_HDR_FLAG_%s is set\n"), hdr_flags[i].name);
+
+       tprintf(T("Chunk Size                  = %u\n"), WIM_CHUNK_SIZE);
+       tfputs (T("GUID                        = "), stdout);
+       print_byte_field(hdr->guid, WIM_GID_LEN, stdout);
+       tputchar(T('\n'));
+       tprintf(T("Part Number                 = %hu\n"), w->hdr.part_number);
+       tprintf(T("Total Parts                 = %hu\n"), w->hdr.total_parts);
+       tprintf(T("Image Count                 = %u\n"), hdr->image_count);
+       tprintf(T("Lookup Table Size           = %"PRIu64"\n"),
                                (u64)hdr->lookup_table_res_entry.size);
-       printf("Lookup Table Flags          = 0x%hhx\n",
-                               hdr->lookup_table_res_entry.flags);
-       printf("Lookup Table Offset         = %"PRIu64"\n",
+       tprintf(T("Lookup Table Flags          = 0x%hhx\n"),
+                               (u8)hdr->lookup_table_res_entry.flags);
+       tprintf(T("Lookup Table Offset         = %"PRIu64"\n"),
                                hdr->lookup_table_res_entry.offset);
-       printf("Lookup Table Original_size  = %"PRIu64"\n",
+       tprintf(T("Lookup Table Original_size  = %"PRIu64"\n"),
                                hdr->lookup_table_res_entry.original_size);
-       printf("XML Data Size               = %"PRIu64"\n",
+       tprintf(T("XML Data Size               = %"PRIu64"\n"),
                                (u64)hdr->xml_res_entry.size);
-       printf("XML Data Flags              = 0x%hhx\n",
-                               hdr->xml_res_entry.flags);
-       printf("XML Data Offset             = %"PRIu64"\n",
+       tprintf(T("XML Data Flags              = 0x%hhx\n"),
+                               (u8)hdr->xml_res_entry.flags);
+       tprintf(T("XML Data Offset             = %"PRIu64"\n"),
                                hdr->xml_res_entry.offset);
-       printf("XML Data Original Size      = %"PRIu64"\n",
+       tprintf(T("XML Data Original Size      = %"PRIu64"\n"),
                                hdr->xml_res_entry.original_size);
-       printf("Boot Metadata Size          = %"PRIu64"\n",
+       tprintf(T("Boot Metadata Size          = %"PRIu64"\n"),
                                (u64)hdr->boot_metadata_res_entry.size);
-       printf("Boot Metadata Flags         = 0x%hhx\n",
-                               hdr->boot_metadata_res_entry.flags);
-       printf("Boot Metadata Offset        = %"PRIu64"\n",
+       tprintf(T("Boot Metadata Flags         = 0x%hhx\n"),
+                               (u8)hdr->boot_metadata_res_entry.flags);
+       tprintf(T("Boot Metadata Offset        = %"PRIu64"\n"),
                                hdr->boot_metadata_res_entry.offset);
-       printf("Boot Metadata Original Size = %"PRIu64"\n",
+       tprintf(T("Boot Metadata Original Size = %"PRIu64"\n"),
                                hdr->boot_metadata_res_entry.original_size);
-       printf("Boot Index                  = %u\n", hdr->boot_idx);
-       printf("Integrity Size              = %"PRIu64"\n",
-                                       (u64)hdr->integrity.size);
-       printf("Integrity Flags             = 0x%hhx\n",
-                                       hdr->integrity.flags);
-       printf("Integrity Offset            = %"PRIu64"\n",
-                                       hdr->integrity.offset);
-       printf("Integrity Original_size     = %"PRIu64"\n",
-                                       hdr->integrity.original_size);
+       tprintf(T("Boot Index                  = %u\n"), hdr->boot_idx);
+       tprintf(T("Integrity Size              = %"PRIu64"\n"),
+                               (u64)hdr->integrity.size);
+       tprintf(T("Integrity Flags             = 0x%hhx\n"),
+                               (u8)hdr->integrity.flags);
+       tprintf(T("Integrity Offset            = %"PRIu64"\n"),
+                               hdr->integrity.offset);
+       tprintf(T("Integrity Original_size     = %"PRIu64"\n"),
+                               hdr->integrity.original_size);
 }