*: make GNU licensing statement forms more regular

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

diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
index afa3672ad2db2f0e3fb6190754d5c0ed29efe733..4f68ba3d8f359479d8c9371b606e4a16f8067980 100644 (file)
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.c
@@ -1,34 +1,22 @@
+/* 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 source tree.
  */
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <getopt.h>
+
+#include "libbb.h"
 #include "unarchive.h"
-#include "busybox.h"
+#include "ar.h"
 
-extern void unpack_ar_archive(archive_handle_t *ar_archive)
+void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
 {
        char magic[7];
 
-       archive_xread_all(ar_archive, magic, 7);
-       if (strncmp(magic, "!<arch>", 7) != 0) {
-               error_msg_and_die("Invalid ar magic");
+       xread(ar_archive->src_fd, magic, AR_MAGIC_LEN);
+       if (strncmp(magic, AR_MAGIC, AR_MAGIC_LEN) != 0) {
+               bb_error_msg_and_die("invalid ar magic");
        }
-       ar_archive->offset += 7;
+       ar_archive->offset += AR_MAGIC_LEN;
 
-       while (get_header_ar(ar_archive) == EXIT_SUCCESS);
+       while (get_header_ar(ar_archive) == EXIT_SUCCESS)
+               continue;
 }