X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fresource.c;h=f6e30fc8373e1d8fce547c2ed35ede544c8caff4;hb=0f4054ebfa380de7c85edfabf215599a8ff63143;hp=7631dd492309283bb7d8fa72a569004f64ae619d;hpb=a0bee8fd4aed91f2ec4da35077dad47582a12a72;p=wimlib diff --git a/src/resource.c b/src/resource.c index 7631dd49..f6e30fc8 100644 --- a/src/resource.c +++ b/src/resource.c @@ -7,27 +7,31 @@ /* * Copyright (C) 2012, 2013 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * 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 + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 3 of the License, or (at your option) any later - * version. + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. * - * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "wimlib.h" +#include +#include +#include + +#include "wimlib/alloca.h" #include "wimlib/assert.h" +#include "wimlib/bitops.h" #include "wimlib/endianness.h" #include "wimlib/error.h" #include "wimlib/file_io.h" @@ -37,7 +41,7 @@ #include "wimlib/wim.h" #ifdef __WIN32__ -/* for read_win32_file_prefix(), read_win32_encrypted_file_prefix() */ +/* for read_winnt_file_prefix(), read_win32_encrypted_file_prefix() */ # include "wimlib/win32.h" #endif @@ -46,13 +50,6 @@ # include "wimlib/ntfs_3g.h" #endif -#ifdef HAVE_ALLOCA_H -# include -#endif -#include -#include -#include -#include /* * Compressed WIM resources @@ -169,10 +166,10 @@ read_compressed_wim_resource(const struct wim_resource_spec * const rspec, struct filedes * const in_fd = &rspec->wim->in_fd; /* Determine if we're reading a pipable resource from a pipe or not. */ - const bool is_pipe_read = !filedes_is_seekable(in_fd); + const bool is_pipe_read = (rspec->is_pipable && !filedes_is_seekable(in_fd)); - /* Determine if the chunk table is in an altenate format. */ - const bool alt_chunk_table = (rspec->flags & WIM_RESHDR_FLAG_PACKED_STREAMS) + /* Determine if the chunk table is in an alternate format. */ + const bool alt_chunk_table = (rspec->flags & WIM_RESHDR_FLAG_SOLID) && !is_pipe_read; /* Get the maximum size of uncompressed chunks in this resource, which @@ -193,6 +190,7 @@ read_compressed_wim_resource(const struct wim_resource_spec * const rspec, "expected power-of-2 chunk size (got %"PRIu32")", chunk_size); ret = WIMLIB_ERR_INVALID_CHUNK_SIZE; + errno = EINVAL; goto out_free_memory; } @@ -205,13 +203,16 @@ read_compressed_wim_resource(const struct wim_resource_spec * const rspec, rspec->wim->decompressor_ctype = WIMLIB_COMPRESSION_TYPE_NONE; rspec->wim->decompressor = NULL; } else { - ret = wimlib_create_decompressor(ctype, chunk_size, NULL, + ret = wimlib_create_decompressor(ctype, chunk_size, &decompressor); - if (ret) + if (ret) { + if (ret != WIMLIB_ERR_NOMEM) + errno = EINVAL; goto out_free_memory; + } } - const u32 chunk_order = bsr32(chunk_size); + const u32 chunk_order = fls32(chunk_size); /* Calculate the total number of chunks the resource is divided into. */ const u64 num_chunks = (rspec->uncompressed_size + chunk_size - 1) >> chunk_order; @@ -323,8 +324,8 @@ read_compressed_wim_resource(const struct wim_resource_spec * const rspec, /* Now fill in chunk_offsets from the entries we have read in * chunk_tab_data. We break aliasing rules here to avoid having * to allocate yet another array. */ - typedef le64 __attribute__((may_alias)) aliased_le64_t; - typedef le32 __attribute__((may_alias)) aliased_le32_t; + typedef le64 _may_alias_attribute aliased_le64_t; + typedef le32 _may_alias_attribute aliased_le32_t; u64 * chunk_offsets_p = chunk_offsets; if (alt_chunk_table) { @@ -741,7 +742,7 @@ int skip_wim_stream(struct wim_lookup_table_entry *lte) { wimlib_assert(lte->resource_location == RESOURCE_IN_WIM); - wimlib_assert(!(lte->flags & WIM_RESHDR_FLAG_PACKED_STREAMS)); + wimlib_assert(!(lte->flags & WIM_RESHDR_FLAG_SOLID)); DEBUG("Skipping stream (size=%"PRIu64")", lte->size); return read_partial_wim_resource(lte->rspec, 0, @@ -789,6 +790,34 @@ read_file_on_disk_prefix(const struct wim_lookup_table_entry *lte, u64 size, return ret; } +#ifdef WITH_FUSE +static int +read_staging_file_prefix(const struct wim_lookup_table_entry *lte, u64 size, + consume_data_callback_t cb, void *cb_ctx) +{ + int raw_fd; + struct filedes fd; + int ret; + + wimlib_assert(size <= lte->size); + + DEBUG("Reading %"PRIu64" bytes from staging file \"%s\"", + size, lte->staging_file_name); + + raw_fd = openat(lte->staging_dir_fd, lte->staging_file_name, + O_RDONLY | O_NOFOLLOW); + if (raw_fd < 0) { + ERROR_WITH_ERRNO("Can't open staging file \"%s\"", + lte->staging_file_name); + return WIMLIB_ERR_OPEN; + } + filedes_init(&fd, raw_fd); + ret = read_raw_file_data(&fd, 0, size, cb, cb_ctx); + filedes_close(&fd); + return ret; +} +#endif + /* This function handles the trivial case of reading stream data that is, in * fact, already located in an in-memory buffer. */ static int @@ -828,7 +857,7 @@ read_stream_prefix(const struct wim_lookup_table_entry *lte, u64 size, [RESOURCE_IN_FILE_ON_DISK] = read_file_on_disk_prefix, [RESOURCE_IN_ATTACHED_BUFFER] = read_buffer_prefix, #ifdef WITH_FUSE - [RESOURCE_IN_STAGING_FILE] = read_file_on_disk_prefix, + [RESOURCE_IN_STAGING_FILE] = read_staging_file_prefix, #endif #ifdef WITH_NTFS_3G [RESOURCE_IN_NTFS_VOLUME] = read_ntfs_file_prefix, @@ -983,17 +1012,12 @@ streamifier_cb(const void *chunk, size_t size, void *_ctx) wimlib_assert(size <= ctx->cur_stream->size - ctx->cur_stream_offset); if (ctx->cur_stream_offset == 0) { - u32 flags; /* Starting a new stream. */ DEBUG("Begin new stream (size=%"PRIu64").", ctx->cur_stream->size); - flags = BEGIN_STREAM_FLAG_PARTIAL_RESOURCE; - if (size == ctx->cur_stream->size) - flags |= BEGIN_STREAM_FLAG_WHOLE_STREAM; ret = (*ctx->cbs.begin_stream)(ctx->cur_stream, - flags, ctx->cbs.begin_stream_ctx); if (ret) return ret; @@ -1039,8 +1063,7 @@ struct hasher_context { /* Callback for starting to read a stream while calculating its SHA1 message * digest. */ static int -hasher_begin_stream(struct wim_lookup_table_entry *lte, u32 flags, - void *_ctx) +hasher_begin_stream(struct wim_lookup_table_entry *lte, void *_ctx) { struct hasher_context *ctx = _ctx; @@ -1049,8 +1072,7 @@ hasher_begin_stream(struct wim_lookup_table_entry *lte, u32 flags, if (ctx->cbs.begin_stream == NULL) return 0; else - return (*ctx->cbs.begin_stream)(lte, flags, - ctx->cbs.begin_stream_ctx); + return (*ctx->cbs.begin_stream)(lte, ctx->cbs.begin_stream_ctx); } /* A consume_data_callback_t implementation that continues calculating the SHA1 @@ -1069,13 +1091,6 @@ hasher_consume_chunk(const void *chunk, size_t size, void *_ctx) return (*ctx->cbs.consume_chunk)(chunk, size, ctx->cbs.consume_chunk_ctx); } -static void -get_sha1_string(const u8 md[SHA1_HASH_SIZE], tchar *str) -{ - for (size_t i = 0; i < SHA1_HASH_SIZE; i++) - str += tsprintf(str, T("%02x"), md[i]); -} - /* Callback for finishing reading a stream while calculating its SHA1 message * digest. */ static int @@ -1110,8 +1125,8 @@ hasher_end_stream(struct wim_lookup_table_entry *lte, int status, void *_ctx) if (wimlib_print_errors) { tchar expected_hashstr[SHA1_HASH_SIZE * 2 + 1]; tchar actual_hashstr[SHA1_HASH_SIZE * 2 + 1]; - get_sha1_string(lte->hash, expected_hashstr); - get_sha1_string(hash, actual_hashstr); + sprint_hash(lte->hash, expected_hashstr); + sprint_hash(hash, actual_hashstr); ERROR("The stream is corrupted!\n" " (Expected SHA1=%"TS",\n" " got SHA1=%"TS")", @@ -1139,7 +1154,7 @@ read_full_stream_with_cbs(struct wim_lookup_table_entry *lte, { int ret; - ret = (*cbs->begin_stream)(lte, 0, cbs->begin_stream_ctx); + ret = (*cbs->begin_stream)(lte, cbs->begin_stream_ctx); if (ret) return ret; @@ -1172,11 +1187,11 @@ read_full_stream_with_sha1(struct wim_lookup_table_entry *lte, } static int -read_packed_streams(struct wim_lookup_table_entry *first_stream, - struct wim_lookup_table_entry *last_stream, - u64 stream_count, - size_t list_head_offset, - const struct read_stream_list_callbacks *sink_cbs) +read_streams_in_solid_resource(struct wim_lookup_table_entry *first_stream, + struct wim_lookup_table_entry *last_stream, + u64 stream_count, + size_t list_head_offset, + const struct read_stream_list_callbacks *sink_cbs) { struct data_range *ranges; bool ranges_malloced; @@ -1251,8 +1266,8 @@ read_packed_streams(struct wim_lookup_table_entry *first_stream, * Read a list of streams, each of which may be in any supported location (e.g. * in a WIM or in an external file). Unlike read_stream_prefix() or the * functions which call it, this function optimizes the case where multiple - * streams are packed into a single compressed WIM resource and reads them all - * consecutively, only decompressing the data one time. + * streams are combined into a single solid compressed WIM resource and reads + * them all consecutively, only decompressing the data one time. * * @stream_list * List of streams (represented as `struct wim_lookup_table_entry's) to @@ -1329,7 +1344,7 @@ read_stream_list(struct list_head *stream_list, { lte = (struct wim_lookup_table_entry*)((u8*)cur - list_head_offset); - if (lte->flags & WIM_RESHDR_FLAG_PACKED_STREAMS && + if (lte->flags & WIM_RESHDR_FLAG_SOLID && lte->size != lte->rspec->uncompressed_size) { @@ -1365,10 +1380,10 @@ read_stream_list(struct list_head *stream_list, * read and @lte_last specifies the last stream * in the resource that needs to be read. */ next = next2; - ret = read_packed_streams(lte, lte_last, - stream_count, - list_head_offset, - sink_cbs); + ret = read_streams_in_solid_resource(lte, lte_last, + stream_count, + list_head_offset, + sink_cbs); if (ret) return ret; continue; @@ -1410,7 +1425,7 @@ extract_stream(struct wim_lookup_table_entry *lte, u64 size, /* A consume_data_callback_t implementation that writes the chunk of data to a * file descriptor. */ -int +static int extract_chunk_to_fd(const void *chunk, size_t size, void *_fd_p) { struct filedes *fd = _fd_p; @@ -1454,7 +1469,7 @@ sha1_stream(struct wim_lookup_table_entry *lte) /* Convert a short WIM resource header to a stand-alone WIM resource * specification. * - * Note: for packed resources some fields still need to be overridden. + * Note: for solid resources some fields still need to be overridden. */ void wim_res_hdr_to_spec(const struct wim_reshdr *reshdr, WIMStruct *wim,