From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- .../archival/libunarchive/data_extract_to_buffer.c | 25 ++++++---------------- 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'release/src/router/busybox/archival/libunarchive/data_extract_to_buffer.c') diff --git a/release/src/router/busybox/archival/libunarchive/data_extract_to_buffer.c b/release/src/router/busybox/archival/libunarchive/data_extract_to_buffer.c index db5521bc..1d74e033 100644 --- a/release/src/router/busybox/archival/libunarchive/data_extract_to_buffer.c +++ b/release/src/router/busybox/archival/libunarchive/data_extract_to_buffer.c @@ -1,28 +1,17 @@ +/* vi: set sw=4 ts=4: */ /* - * This program 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 2 of the License, or - * (at your option) any later version. + * Copyright 2002 Glenn McGrath * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include "libbb.h" #include "unarchive.h" -extern void data_extract_to_buffer(archive_handle_t *archive_handle) +void FAST_FUNC data_extract_to_buffer(archive_handle_t *archive_handle) { - const unsigned int size = archive_handle->file_header->size; - - archive_handle->buffer = xmalloc(size + 1); + unsigned int size = archive_handle->file_header->size; - archive_xread_all(archive_handle, archive_handle->buffer, size); - archive_handle->buffer[size] = '\0'; + archive_handle->buffer = xzalloc(size + 1); + xread(archive_handle->src_fd, archive_handle->buffer, size); } -- cgit v1.2.3-54-g00ecf