- whitespace cleanup and add a possible shrinkage suggestion

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

diff --git a/archival/cpio.c b/archival/cpio.c
index 0fbe7b8e54c76982ef8be0f30f505a0b767c803f..011386782e641ed04aebb824c0876fce2339f552 100644 (file)
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 2001 by Glenn McGrath
  *
- * 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.
  *
  * Limitations:
  *             Doesn't check CRC's
@@ -24,34 +12,34 @@
  *
  */
 #include <fcntl.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "unarchive.h"
 #include "busybox.h"
 
-#define CPIO_OPT_EXTRACT               0x01
-#define CPIO_OPT_TEST                  0x02
-#define CPIO_OPT_UNCONDITIONAL         0x04
-#define CPIO_OPT_VERBOSE               0x08
-#define CPIO_OPT_FILE                  0x10
+#define CPIO_OPT_EXTRACT                       0x01
+#define CPIO_OPT_TEST                          0x02
+#define CPIO_OPT_UNCONDITIONAL         0x04
+#define CPIO_OPT_VERBOSE                       0x08
+#define CPIO_OPT_FILE                          0x10
 #define CPIO_OPT_CREATE_LEADING_DIR    0x20
-#define CPIO_OPT_PRESERVE_MTIME        0x40
+#define CPIO_OPT_PRESERVE_MTIME                0x40
 
-extern int cpio_main(int argc, char **argv)
+int cpio_main(int argc, char **argv);
+int cpio_main(int argc, char **argv)
 {
        archive_handle_t *archive_handle;
        char *cpio_filename = NULL;
-       unsigned long opt;
+       unsigned opt;
 
        /* Initialise */
        archive_handle = init_handle();
        archive_handle->src_fd = STDIN_FILENO;
-       archive_handle->seek = seek_by_char;
+       archive_handle->seek = seek_by_read;
        archive_handle->flags = ARCHIVE_EXTRACT_NEWER | ARCHIVE_PRESERVE_DATE;
 
-       opt = bb_getopt_ulflags(argc, argv, "ituvF:dm", &cpio_filename);
+       opt = getopt32(argc, argv, "ituvF:dm", &cpio_filename);
 
        /* One of either extract or test options must be given */
        if ((opt & (CPIO_OPT_TEST | CPIO_OPT_EXTRACT)) == 0) {
@@ -59,7 +47,7 @@ extern int cpio_main(int argc, char **argv)
        }
 
        if (opt & CPIO_OPT_TEST) {
-               /* if both extract and test option are given, ignore extract option */
+               /* if both extract and test options are given, ignore extract option */
                if (opt & CPIO_OPT_EXTRACT) {
                        opt &= ~CPIO_OPT_EXTRACT;
                }
@@ -79,8 +67,8 @@ extern int cpio_main(int argc, char **argv)
                        archive_handle->action_header = header_list;
                }
        }
-       if (cpio_filename) {    /* CPIO_OPT_FILE */
-               archive_handle->src_fd = bb_xopen(cpio_filename, O_RDONLY);
+       if (cpio_filename) { /* CPIO_OPT_FILE */
+               archive_handle->src_fd = xopen(cpio_filename, O_RDONLY);
                archive_handle->seek = seek_by_jump;
        }
        if (opt & CPIO_OPT_CREATE_LEADING_DIR) {
@@ -89,11 +77,11 @@ extern int cpio_main(int argc, char **argv)
 
        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]);
                optind++;
        }
 
        while (get_header_cpio(archive_handle) == EXIT_SUCCESS);
 
-       return(EXIT_SUCCESS);
+       return EXIT_SUCCESS;
 }