- whitespace cleanup and add a possible shrinkage suggestion

[oweals/busybox.git] / archival / ar.c

diff --git a/archival/ar.c b/archival/ar.c
index de5bc9b845f4adcc8a29967ee8911e1248875539..23d9b49a5c37994733d45ccabc2b6b6cc29d4e9a 100644 (file)
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -7,35 +7,15 @@
  *
  * 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
  * between different systems
  * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
  */
 
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <utime.h>
-#include <unistd.h>
-
-#include "unarchive.h"
 #include "busybox.h"
+#include "unarchive.h"
 
 static void header_verbose_list_ar(const file_header_t *file_header)
 {
@@ -46,7 +26,8 @@ static void header_verbose_list_ar(const file_header_t *file_header)
        mtime[16] = ' ';
        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);
 }
 
 #define AR_CTX_PRINT           0x01
@@ -57,26 +38,20 @@ static void header_verbose_list_ar(const file_header_t *file_header)
 #define AR_OPT_CREATE          0x20
 #define AR_OPT_INSERT          0x40
 
-extern int ar_main(int argc, char **argv)
+int ar_main(int argc, char **argv);
+int ar_main(int argc, char **argv)
 {
        archive_handle_t *archive_handle;
-       unsigned long opt;
-       static const char msg_unsupported_err[] = 
+       unsigned opt;
+       static const char msg_unsupported_err[] =
                        "Archive %s not supported.  Install binutils 'ar'.";
        char magic[8];
 
        archive_handle = init_handle();
-       
-       /* Prepend '-' to the first argument if required */
-       if (argv[1][0] != '-')
-               argv[1] = bb_xasprintf("-%s", argv[1]);
-
-       bb_opt_complementally = "?p~tx:t~px:x~pt";
-       opt = bb_getopt_ulflags(argc, argv, "ptxovcr");
 
-       if ((opt == 0) || (optind == argc)) {
-               bb_show_usage();
-       }
+       /* Prepend '-' to the first argument if required */
+       opt_complementary = "--:p:t:x:-1:?:p--tx:t--px:x--pt";
+       opt = getopt32(argc, argv, "ptxovcr");
 
        if (opt & AR_CTX_PRINT) {
                archive_handle->action_data = data_extract_to_stdout;
@@ -100,20 +75,20 @@ extern int ar_main(int argc, char **argv)
                bb_error_msg_and_die(msg_unsupported_err, "insertion");
        }
 
-       archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY);
+       archive_handle->src_fd = xopen(argv[optind++], O_RDONLY);
 
        while (optind < argc) {
                archive_handle->filter = filter_accept_list;
-               archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind++]);
+               llist_add_to(&(archive_handle->accept), argv[optind++]);
        }
 
-       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) /* repeat */;
 
        return EXIT_SUCCESS;
 }