/*
* 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 "wimlib/assert.h"
#include "wimlib/endianness.h"
#include "wimlib/error.h"
#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
int errno_save;
u64 *chunk_offsets = NULL;
+ u8 *_ubuf = NULL;
u8 *ubuf = NULL;
void *cbuf = NULL;
bool chunk_offsets_malloced = false;
/* Determine if we're reading a pipable resource from a pipe or not. */
const bool is_pipe_read = (rspec->is_pipable && !filedes_is_seekable(in_fd));
- /* Determine if the chunk table is in an altenate format. */
+ /* Determine if the chunk table is in an alternate format. */
const bool alt_chunk_table = (rspec->flags & WIM_RESHDR_FLAG_PACKED_STREAMS)
&& !is_pipe_read;
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 != WIMLIB_ERR_NOMEM)
/* Allocate buffer for holding the uncompressed data of each chunk. */
if (chunk_size <= STACK_MAX) {
- ubuf = alloca(chunk_size);
+ _ubuf = alloca(chunk_size + 15);
} else {
- ubuf = MALLOC(chunk_size);
- if (ubuf == NULL)
+ _ubuf = MALLOC(chunk_size + 15);
+ if (_ubuf == NULL)
goto oom;
ubuf_malloced = true;
}
+ ubuf = (u8 *)(((uintptr_t)_ubuf + 15) & ~15);
/* Allocate a temporary buffer for reading compressed chunks, each of
* which can be at most @chunk_size - 1 bytes. This excludes compressed
if (chunk_offsets_malloced)
FREE(chunk_offsets);
if (ubuf_malloced)
- FREE(ubuf);
+ FREE(_ubuf);
if (cbuf_malloced)
FREE(cbuf);
errno = errno_save;
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;
/* 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;
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
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
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")",
{
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;
/* 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;