Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/archival/ar.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/archival/ar.c (modified) (7 diffs)

branches/2.2.5/mindi-busybox/archival/ar.c

@@ -8 +8 @@
  * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar.
  *
- * 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
- * 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.
  *
  * There is no single standard to adhere to so ar may not portable
@@ -27 +15 @@
  */
 
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <utime.h>
-#include <unistd.h>
-
+#include "libbb.h"
 #include "unarchive.h"
-#include "busybox.h"
 
 static void header_verbose_list_ar(const file_header_t *file_header)
@@ -47 +27 @@
     memmove(&mtime[17], &mtime[20], 4);
     mtime[21] = '\0';
-    printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid, (int) file_header->size, &mtime[4], file_header->name);
+    printf("%s %d/%d%7d %s %s\n", &mode[1], file_header->uid, file_header->gid,
+            (int) file_header->size, &mtime[4], file_header->name);
 }
 
@@ -58 +39 @@
 #define AR_OPT_INSERT       0x40
 
+int ar_main(int argc, char **argv);
 int ar_main(int argc, char **argv)
 {
+    static const char msg_unsupported_err[] ALIGN1 =
+        "archive %s is not supported";
+
     archive_handle_t *archive_handle;
-    unsigned long opt;
-    static const char msg_unsupported_err[] =
-            "Archive %s not supported.  Install binutils 'ar'.";
+    unsigned opt;
     char magic[8];
 
@@ -69 +52 @@
 
     /* Prepend '-' to the first argument if required */
-    bb_opt_complementally = "--:p:t:x:-1:?:p--tx:t--px:x--pt";
-    opt = bb_getopt_ulflags(argc, argv, "ptxovcr");
+    opt_complementary = "--:p:t:x:-1:p--tx:t--px:x--pt";
+    opt = getopt32(argv, "ptxovcr");
 
     if (opt & AR_CTX_PRINT) {
@@ -94 +77 @@
     }
 
-    archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY);
+    archive_handle->src_fd = xopen(argv[optind++], O_RDONLY);
 
     while (optind < argc) {
@@ -101 +84 @@
     }
 
-    archive_xread_all(archive_handle, magic, 7);
+    xread(archive_handle->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");
     }
     archive_handle->offset += 7;
 
-    while (get_header_ar(archive_handle) == EXIT_SUCCESS);
+    while (get_header_ar(archive_handle) == EXIT_SUCCESS)
+        continue;
 
     return EXIT_SUCCESS;