header_verbose_list: stop truncating file size in listing

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

diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c
index d858797977bfc3de8b97e44ac286966b43d1da6d..007f68c6d9b6b5e1281068498aedad71024d2d7f 100644 (file)
--- 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"
 
-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 = bb_full_read(archive_handle->src_fd, buf, count);
-       if ((size != 0) && (size != count)) {
-               bb_perror_msg_and_die("Short read, read %ld of %ld", (long)size, (long)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;
 }