X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Flibunarchive%2Farchive_xread_all_eof.c;h=007f68c6d9b6b5e1281068498aedad71024d2d7f;hb=cf30cc82a343802b601f01ae153916887f11eb7b;hp=3cfbbd8d1bbcc6838599a1ef5c79a7a7ce5204d1;hpb=237ae42fc96ede945d28d9054f045b73e419d089;p=oweals%2Fbusybox.git

diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c
index 3cfbbd8d1..007f68c6d 100644
--- a/archival/libunarchive/archive_xread_all_eof.c
+++ b/archival/libunarchive/archive_xread_all_eof.c
@@ -1,32 +1,20 @@
+/* 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.
- *
- *  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 Library 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "unarchive.h"
 #include "libbb.h"
 
-extern ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count)
+ssize_t archive_xread_all_eof(archive_handle_t *archive_handle,
+			unsigned char *buf, size_t count)
 {
 	ssize_t size;
 
-	size = archive_xread(archive_handle, buf, count);
-	if ((size != 0) && (size != count)) {
-		perror_msg_and_die("Short read, read %d of %d", size, count);
+	size = full_read(archive_handle->src_fd, buf, count);
+	if (size != 0 && size != count) {
+		bb_error_msg_and_die("short read: %u of %u",
+				(unsigned)size, (unsigned)count);
 	}
-	return(size);
+	return size;
 }