X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=f3d8c537d4237730d89ca24a56545f2c05225bdb;hp=e2ce02e7bc4ea29b3bc4908df3a20e1eeca8fec7;hb=f5d26d6005ba759762bec8c7cd45a738e577a8a7;hpb=c7f1c7e38a23290bd5edd2a70c234875cc299901 diff --git a/src/lookup_table.c b/src/lookup_table.c index e2ce02e7..f3d8c537 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -24,14 +24,23 @@ * 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 #include - #ifdef WITH_FUSE -#include +# include /* for unlink() */ #endif struct wim_lookup_table * @@ -58,7 +67,7 @@ new_lookup_table(size_t capacity) } struct wim_lookup_table_entry * -new_lookup_table_entry() +new_lookup_table_entry(void) { struct wim_lookup_table_entry *lte; @@ -79,11 +88,10 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old) { 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__ @@ -102,32 +110,30 @@ clone_lookup_table_entry(const struct wim_lookup_table_entry *old) 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 @@ -342,6 +348,23 @@ for_lookup_table_entry_pos_sorted(struct wim_lookup_table *table, 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; + /* * Reads the lookup table from a WIM file. * @@ -356,11 +379,12 @@ read_lookup_table(WIMStruct *w) size_t num_entries; struct wim_lookup_table *table; struct wim_lookup_table_entry *cur_entry, *duplicate_entry; - u8 table_buf[(BUFFER_SIZE / WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE) * - WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE]; - const u8 *p; + struct wim_lookup_table_entry_disk + table_buf[BUFFER_SIZE / sizeof(struct wim_lookup_table_entry_disk)] + _aligned_attribute(8); 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, @@ -373,7 +397,7 @@ read_lookup_table(WIMStruct *w) } num_entries = w->hdr.lookup_table_res_entry.size / - WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE; + sizeof(struct wim_lookup_table_entry_disk); table = new_lookup_table(num_entries * 2 + 1); if (!table) return WIMLIB_ERR_NOMEM; @@ -381,15 +405,14 @@ read_lookup_table(WIMStruct *w) w->current_image = 0; offset = w->hdr.lookup_table_res_entry.offset; buf_entries_remaining = 0; - for (; num_entries != 0; num_entries--, buf_entries_remaining--) { + 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(sizeof(table_buf) / - WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE, - num_entries); - bytes_to_read = entries_to_read * - WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE; + 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) { @@ -399,7 +422,7 @@ read_lookup_table(WIMStruct *w) goto out_free_lookup_table; } offset += bytes_to_read; - p = table_buf; + disk_entry = table_buf; buf_entries_remaining = entries_to_read; } cur_entry = new_lookup_table_entry(); @@ -410,10 +433,10 @@ read_lookup_table(WIMStruct *w) 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 " @@ -524,14 +547,14 @@ out: } -static u8 * -write_lookup_table_entry(struct wim_lookup_table_entry *lte, u8 *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 @@ -541,32 +564,34 @@ write_lookup_table_from_stream_list(struct list_head *stream_list, { int ret; off_t start_offset; - u8 table_buf[(BUFFER_SIZE / WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE) * - WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE]; - u8 *buf_p; + struct wim_lookup_table_entry_disk + table_buf[BUFFER_SIZE / sizeof(struct wim_lookup_table_entry_disk)] + _aligned_attribute(8); size_t table_size; size_t bytes_to_write; struct wim_lookup_table_entry *lte; + size_t cur_idx; start_offset = filedes_offset(out_fd); if (start_offset == -1) goto write_error; - buf_p = table_buf; table_size = 0; + cur_idx = 0; list_for_each_entry(lte, stream_list, lookup_table_list) { - if (buf_p == table_buf + sizeof(table_buf)) { + 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; - buf_p = table_buf; + cur_idx = 0; } - buf_p = write_lookup_table_entry(lte, buf_p); + write_lookup_table_entry(lte, &table_buf[cur_idx]); + cur_idx++; } - bytes_to_write = buf_p - table_buf; - if (bytes_to_write != 0) { + 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; @@ -824,6 +849,19 @@ out: } #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