*: 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 9c2f68b1418d2e79ff2731b1ef3f7d270130ff52..4f68ba3d8f359479d8c9371b606e4a16f8067980 100644 (file)
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.c
@@ -1,20 +1,22 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 #include "unarchive.h"
+#include "ar.h"
 
 void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
 {
        char magic[7];
 
-       xread(ar_archive->src_fd, magic, 7);
-       if (strncmp(magic, "!<arch>", 7) != 0) {
+       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;
 }