X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Flibunarchive%2Funpack_ar_archive.c;h=6a84ae81172918ee779543a61f467b19bfb2dcbf;hb=714701c890b5f03253c5ecdb7367c4258ce78715;hp=7bb40af5b8bc03d96d61eb0cd417b231af7d458d;hpb=dfba741457cc81eb2ed3a9d4c074fbad74aa3249;p=oweals%2Fbusybox.git

diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
index 7bb40af5b..6a84ae811 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.c
@@ -1,31 +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 <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include "unarchive.h"
-#include "busybox.h"
+#include "libbb.h"
 
 void unpack_ar_archive(archive_handle_t *ar_archive)
 {
 	char magic[7];
 
-	archive_xread_all(ar_archive, magic, 7);
+	xread(ar_archive->src_fd, magic, 7);
 	if (strncmp(magic, "!<arch>", 7) != 0) {
-		bb_error_msg_and_die("Invalid ar magic");
+		bb_error_msg_and_die("invalid ar magic");
 	}
 	ar_archive->offset += 7;