* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
-#include "wimlib_internal.h"
-#include "lookup_table.h"
-#include "buffer_io.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "wimlib/endianness.h"
+#include "wimlib/error.h"
+#include "wimlib/file_io.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/paths.h"
+#include "wimlib/resource.h"
+#include "wimlib/util.h"
+
#include <errno.h>
#include <stdlib.h>
-
#ifdef WITH_FUSE
-#include <unistd.h>
+# include <unistd.h> /* for unlink() */
#endif
struct wim_lookup_table *
} else {
FREE(table);
table = NULL;
- ERROR("Failed to allocate memory for lookup table with capacity %zu",
- capacity);
+ ERROR("Failed to allocate memory for lookup table "
+ "with capacity %zu", capacity);
}
}
return table;
}
struct wim_lookup_table_entry *
-new_lookup_table_entry()
+new_lookup_table_entry(void)
{
struct wim_lookup_table_entry *lte;
{
struct wim_lookup_table_entry *new;
- new = MALLOC(sizeof(*new));
+ new = memdup(old, sizeof(struct wim_lookup_table_entry));
if (!new)
return NULL;
- memcpy(new, old, sizeof(*old));
new->extracted_file = NULL;
switch (new->resource_location) {
#ifdef __WIN32__
goto out_free;
break;
case RESOURCE_IN_ATTACHED_BUFFER:
- new->attached_buffer = MALLOC(wim_resource_size(old));
+ new->attached_buffer = memdup(old->attached_buffer,
+ wim_resource_size(old));
if (!new->attached_buffer)
goto out_free;
- memcpy(new->attached_buffer, old->attached_buffer,
- wim_resource_size(old));
break;
#ifdef WITH_NTFS_3G
case RESOURCE_IN_NTFS_VOLUME:
if (old->ntfs_loc) {
struct ntfs_location *loc;
- loc = MALLOC(sizeof(*loc));
+ loc = memdup(old->ntfs_loc, sizeof(struct ntfs_location));
if (!loc)
goto out_free;
- memcpy(loc, old->ntfs_loc, sizeof(*loc));
loc->path = NULL;
loc->stream_name = NULL;
new->ntfs_loc = loc;
loc->path = STRDUP(old->ntfs_loc->path);
if (!loc->path)
goto out_free;
- loc->stream_name = MALLOC((loc->stream_name_nchars + 1) * 2);
- if (!loc->stream_name)
- goto out_free;
- memcpy(loc->stream_name,
- old->ntfs_loc->stream_name,
- (loc->stream_name_nchars + 1) * 2);
+ if (loc->stream_name_nchars) {
+ loc->stream_name = memdup(old->ntfs_loc->stream_name,
+ loc->stream_name_nchars * 2);
+ if (!loc->stream_name)
+ goto out_free;
+ }
}
break;
#endif
wimlib_assert(lte != NULL);
wimlib_assert(lte->refcnt != 0);
if (--lte->refcnt == 0) {
- if (!lte->unhashed)
+ if (lte->unhashed)
+ list_del(<e->unhashed_list);
+ else
lookup_table_unlink(table, lte);
#ifdef WITH_FUSE
if (lte->num_opened_fds == 0)
return ret;
}
+/* On-disk format of a WIM lookup table entry (stream entry). */
+struct wim_lookup_table_entry_disk {
+ /* Location, offset, compression status, and metadata status of the
+ * stream. */
+ struct resource_entry_disk resource_entry;
+
+ /* Which part of the split WIM this stream is in; indexed from 1. */
+ le16 part_number;
+
+ /* Reference count of this stream over all WIM images. */
+ le32 refcnt;
+
+ /* SHA1 message digest of the uncompressed data of this stream, or
+ * optionally all zeroes if this stream is of zero length. */
+ u8 hash[SHA1_HASH_SIZE];
+} _packed_attribute;
+
+#define WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE 50
+
/*
* Reads the lookup table from a WIM file.
*
int
read_lookup_table(WIMStruct *w)
{
- u64 num_entries;
int ret;
+ size_t num_entries;
struct wim_lookup_table *table;
struct wim_lookup_table_entry *cur_entry, *duplicate_entry;
- void *table_buf;
- size_t table_size;
- const void *p;
+ struct wim_lookup_table_entry_disk
+ table_buf[BUFFER_SIZE / sizeof(struct wim_lookup_table_entry_disk)]
+ _aligned_attribute(8);
+
+ BUILD_BUG_ON(sizeof(struct wim_lookup_table_entry_disk) !=
+ WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE);
+
+ off_t offset;
+ size_t buf_entries_remaining;
+ const struct wim_lookup_table_entry_disk *disk_entry;
DEBUG("Reading lookup table: offset %"PRIu64", size %"PRIu64"",
w->hdr.lookup_table_res_entry.offset,
return WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE;
}
- table_size = w->hdr.lookup_table_res_entry.size;
- if (table_size != w->hdr.lookup_table_res_entry.size) {
- ERROR("Lookup table is invalid");
- return WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
- }
-
- table_buf = MALLOC(table_size);
- if (!table_buf)
- return WIMLIB_ERR_NOMEM;
-
- if (full_pread(w->in_fd, table_buf, table_size,
- w->hdr.lookup_table_res_entry.offset) != table_size)
- {
- ret = WIMLIB_ERR_READ;
- goto out_free_table_buf;
- }
-
- num_entries = w->hdr.lookup_table_res_entry.original_size /
- WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE;
+ num_entries = w->hdr.lookup_table_res_entry.size /
+ sizeof(struct wim_lookup_table_entry_disk);
table = new_lookup_table(num_entries * 2 + 1);
- if (!table) {
- ret = WIMLIB_ERR_NOMEM;
- goto out_free_table_buf;
- }
+ if (!table)
+ return WIMLIB_ERR_NOMEM;
w->current_image = 0;
- p = table_buf;
- while (num_entries--) {
+ offset = w->hdr.lookup_table_res_entry.offset;
+ buf_entries_remaining = 0;
+ for (; num_entries != 0;
+ num_entries--, buf_entries_remaining--, disk_entry++)
+ {
+ if (buf_entries_remaining == 0) {
+ size_t entries_to_read, bytes_to_read;
+
+ entries_to_read = min(ARRAY_LEN(table_buf), num_entries);
+ bytes_to_read = entries_to_read * sizeof(struct wim_lookup_table_entry_disk);
+ if (full_pread(w->in_fd, table_buf,
+ bytes_to_read, offset) != bytes_to_read)
+ {
+ ERROR_WITH_ERRNO("Error reading lookup table "
+ "(offset=%"PRIu64")", offset);
+ ret = WIMLIB_ERR_READ;
+ goto out_free_lookup_table;
+ }
+ offset += bytes_to_read;
+ disk_entry = table_buf;
+ buf_entries_remaining = entries_to_read;
+ }
cur_entry = new_lookup_table_entry();
if (!cur_entry) {
ret = WIMLIB_ERR_NOMEM;
cur_entry->wim = w;
cur_entry->resource_location = RESOURCE_IN_WIM;
- p = get_resource_entry(p, &cur_entry->resource_entry);
- p = get_u16(p, &cur_entry->part_number);
- p = get_u32(p, &cur_entry->refcnt);
- p = get_bytes(p, SHA1_HASH_SIZE, cur_entry->hash);
+ get_resource_entry(&disk_entry->resource_entry, &cur_entry->resource_entry);
+ cur_entry->part_number = le16_to_cpu(disk_entry->part_number);
+ cur_entry->refcnt = le32_to_cpu(disk_entry->refcnt);
+ copy_hash(cur_entry->hash, disk_entry->hash);
if (cur_entry->part_number != w->hdr.part_number) {
ERROR("A lookup table entry in part %hu of the WIM "
&& (cur_entry->resource_entry.size !=
cur_entry->resource_entry.original_size))
{
- #ifdef ENABLE_ERROR_MESSAGES
- ERROR("Found uncompressed resource with original size "
- "not the same as compressed size");
- ERROR("The lookup table entry for the resource is as follows:");
- print_lookup_table_entry(cur_entry, stderr);
- #endif
+ if (wimlib_print_errors) {
+ ERROR("Found uncompressed resource with original size "
+ "not the same as compressed size");
+ ERROR("The lookup table entry for the resource is as follows:");
+ print_lookup_table_entry(cur_entry, stderr);
+ }
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
goto out_free_cur_entry;
}
if (cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) {
/* Lookup table entry for a metadata resource */
if (cur_entry->refcnt != 1) {
- #ifdef ENABLE_ERROR_MESSAGES
- ERROR("Found metadata resource with refcnt != 1:");
- print_lookup_table_entry(cur_entry, stderr);
- #endif
+ if (wimlib_print_errors) {
+ ERROR("Found metadata resource with refcnt != 1:");
+ print_lookup_table_entry(cur_entry, stderr);
+ }
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
goto out_free_cur_entry;
}
* metadata resource */
duplicate_entry = __lookup_resource(table, cur_entry->hash);
if (duplicate_entry) {
- #ifdef ENABLE_ERROR_MESSAGES
- ERROR("The WIM lookup table contains two entries with the "
- "same SHA1 message digest!");
- ERROR("The first entry is:");
- print_lookup_table_entry(duplicate_entry, stderr);
- ERROR("The second entry is:");
- print_lookup_table_entry(cur_entry, stderr);
- #endif
+ if (wimlib_print_errors) {
+ ERROR("The WIM lookup table contains two entries with the "
+ "same SHA1 message digest!");
+ ERROR("The first entry is:");
+ print_lookup_table_entry(duplicate_entry, stderr);
+ ERROR("The second entry is:");
+ print_lookup_table_entry(cur_entry, stderr);
+ }
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
goto out_free_cur_entry;
}
}
}
- if (w->hdr.part_number == 1 &&
- w->current_image != w->hdr.image_count)
+ if (w->hdr.part_number == 1 && w->current_image != w->hdr.image_count)
{
ERROR("The WIM header says there are %u images "
"in the WIM, but we only found %d metadata "
DEBUG("Done reading lookup table.");
w->lookup_table = table;
ret = 0;
- goto out_free_table_buf;
+ goto out;
out_free_cur_entry:
FREE(cur_entry);
out_free_lookup_table:
free_lookup_table(table);
-out_free_table_buf:
- FREE(table_buf);
+out:
w->current_image = 0;
return ret;
}
-/*
- * Writes a lookup table entry to the output file.
- */
-static void *
-write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *buf_p)
+static void
+write_lookup_table_entry(const struct wim_lookup_table_entry *lte,
+ struct wim_lookup_table_entry_disk *disk_entry)
{
- buf_p = put_resource_entry(buf_p, <e->output_resource_entry);
- buf_p = put_u16(buf_p, lte->part_number);
- buf_p = put_u32(buf_p, lte->out_refcnt);
- buf_p = put_bytes(buf_p, SHA1_HASH_SIZE, lte->hash);
- return buf_p;
+ put_resource_entry(<e->output_resource_entry, &disk_entry->resource_entry);
+ disk_entry->part_number = cpu_to_le16(lte->part_number);
+ disk_entry->refcnt = cpu_to_le32(lte->out_refcnt);
+ copy_hash(disk_entry->hash, lte->hash);
}
int
write_lookup_table_from_stream_list(struct list_head *stream_list,
- filedes_t out_fd,
+ int out_fd,
struct resource_entry *out_res_entry)
{
- size_t num_entries;
- struct list_head *pos;
+ int ret;
+ off_t start_offset;
+ struct wim_lookup_table_entry_disk
+ table_buf[BUFFER_SIZE / sizeof(struct wim_lookup_table_entry_disk)]
+ _aligned_attribute(8);
size_t table_size;
- void *table_buf;
- void *buf_p;
+ size_t bytes_to_write;
struct wim_lookup_table_entry *lte;
- off_t start_offset;
- int ret;
+ size_t cur_idx;
start_offset = filedes_offset(out_fd);
if (start_offset == -1)
- return WIMLIB_ERR_WRITE;
-
- num_entries = 0;
- list_for_each(pos, stream_list)
- num_entries++;
- table_size = num_entries * WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE;
-
- table_buf = MALLOC(table_size);
- if (!table_buf) {
- ERROR("Failed to allocate lookup table buffer of %zu bytes", table_size);
- return WIMLIB_ERR_NOMEM;
+ goto write_error;
+
+ table_size = 0;
+ cur_idx = 0;
+ list_for_each_entry(lte, stream_list, lookup_table_list) {
+ if (cur_idx == ARRAY_LEN(table_buf)) {
+ bytes_to_write = sizeof(table_buf);
+ if (full_write(out_fd, table_buf,
+ bytes_to_write) != bytes_to_write)
+ goto write_error;
+ table_size += bytes_to_write;
+ cur_idx = 0;
+ }
+ write_lookup_table_entry(lte, &table_buf[cur_idx]);
+ cur_idx++;
}
-
- buf_p = table_buf;
- list_for_each_entry(lte, stream_list, lookup_table_list)
- buf_p = write_lookup_table_entry(lte, buf_p);
-
- wimlib_assert(buf_p - table_buf == table_size);
-
- if (full_write(out_fd, table_buf, table_size) != table_size) {
- ERROR_WITH_ERRNO("Failed to write lookup table");
- ret = WIMLIB_ERR_WRITE;
- goto out_free_table_buf;
+ if (cur_idx != 0) {
+ bytes_to_write = cur_idx * sizeof(struct wim_lookup_table_entry_disk);
+ if (full_write(out_fd, table_buf,
+ bytes_to_write) != bytes_to_write)
+ goto write_error;
+ table_size += bytes_to_write;
}
-
out_res_entry->offset = start_offset;
out_res_entry->size = table_size;
out_res_entry->original_size = table_size;
out_res_entry->flags = WIM_RESHDR_FLAG_METADATA;
ret = 0;
-out_free_table_buf:
- FREE(table_buf);
+out:
return ret;
+write_error:
+ ERROR_WITH_ERRNO("Failed to write lookup table");
+ ret = WIMLIB_ERR_WRITE;
+ goto out;
}
static int
append_lookup_table_entry(struct wim_lookup_table_entry *lte, void *_list)
{
- struct list_head *list = _list;
-
if (lte->out_refcnt != 0)
- list_add_tail(<e->lookup_table_list, list);
+ list_add_tail(<e->lookup_table_list, (struct list_head*)_list);
return 0;
}
-
/* Writes the WIM lookup table to the output file. */
int
write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry)
metadata_lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
append_lookup_table_entry(metadata_lte, &stream_list);
}
-
for_lookup_table_entry(w->lookup_table,
append_lookup_table_entry,
&stream_list);
* Prints the lookup table of a WIM file.
*/
WIMLIBAPI void
-wimlib_print_lookup_table(WIMStruct *w)
+wimlib_print_lookup_table(WIMStruct *wim)
{
- for_lookup_table_entry(w->lookup_table,
+ for (int i = 0; i < wim->hdr.image_count; i++)
+ print_lookup_table_entry(wim->image_metadata[i]->metadata_lte, stdout);
+ for_lookup_table_entry(wim->lookup_table,
do_print_lookup_table_entry,
stdout);
}
}
#endif
+/*
+ * XXX Probably should store the compression type directly in the lookup table
+ * entry
+ */
+int
+wim_resource_compression_type(const struct wim_lookup_table_entry *lte)
+{
+ if (!(lte->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
+ || lte->resource_location != RESOURCE_IN_WIM)
+ return WIMLIB_COMPRESSION_TYPE_NONE;
+ return wimlib_get_compression_type(lte->wim);
+}
+
/* Resolve an inode's lookup table entries
*
* This replaces the SHA1 hash fields (which are used to lookup an entry in the
git://wimlib.net / wimlib / blobdiff