revert last two commits. vfork cannot be used in subroutine,

[oweals/busybox.git] / archival / libunarchive / data_extract_to_buffer.c

diff --git a/archival/libunarchive/data_extract_to_buffer.c b/archival/libunarchive/data_extract_to_buffer.c
index db5521bcb1eb94cad3ac3fa19204071fcf990daa..1d74e03357f2725d526dfce808e839aca08ecf74 100644 (file)
--- a/archival/libunarchive/data_extract_to_buffer.c
+++ b/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);
 }