- reuse strings and messages. Saves about 600B

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

diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index b95ec2d6ef755dc9a56c845c61a9bc369a2716ab..b99f227fcfa8f7f111e68fbd1f7bfb9dee6c6e05 100644 (file)
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -1,24 +1,13 @@
+/* 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.
+ * dpkg-deb packs, unpacks and provides information about Debian archives.
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <getopt.h>
 
 #include "unarchive.h"
 #include "busybox.h"
@@ -29,7 +18,7 @@
 #define DPKG_DEB_OPT_EXTRACT   8
 #define DPKG_DEB_OPT_EXTRACT_VERBOSE   16
 
-extern int dpkg_deb_main(int argc, char **argv)
+int dpkg_deb_main(int argc, char **argv)
 {
        archive_handle_t *ar_archive;
        archive_handle_t *tar_archive;
@@ -47,16 +36,16 @@ extern int dpkg_deb_main(int argc, char **argv)
        ar_archive->filter = filter_accept_list_reassign;
 
 #ifdef CONFIG_FEATURE_DEB_TAR_GZ
-       ar_archive->accept = llist_add_to(NULL, "data.tar.gz");
-       control_tar_llist = llist_add_to(NULL, "control.tar.gz");
+       llist_add_to(&(ar_archive->accept), "data.tar.gz");
+       llist_add_to(&control_tar_llist, "control.tar.gz");
 #endif
 
 #ifdef CONFIG_FEATURE_DEB_TAR_BZ2
-       ar_archive->accept = llist_add_to(ar_archive->accept, "data.tar.bz2");
-       control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2");
+       llist_add_to(&(ar_archive->accept), "data.tar.bz2");
+       llist_add_to(&control_tar_llist, "control.tar.bz2");
 #endif
 
-       bb_opt_complementaly = "c~efXx:e~cfXx:f~ceXx:X~cefx:x~cefX";
+       bb_opt_complementally = "?c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
        opt = bb_getopt_ulflags(argc, argv, "cefXx");
 
        if (opt & DPKG_DEB_OPT_CONTENTS) {
@@ -76,7 +65,7 @@ extern int dpkg_deb_main(int argc, char **argv)
                 * it should accept a second argument which specifies a
                 * specific field to print */
                ar_archive->accept = control_tar_llist;
-               tar_archive->accept = llist_add_to(NULL, "./control");;
+               llist_add_to(&(tar_archive->accept), "./control");
                tar_archive->filter = filter_accept_list;
                tar_archive->action_data = data_extract_to_stdout;
        }
@@ -88,7 +77,7 @@ extern int dpkg_deb_main(int argc, char **argv)
                argcount = 2;
        }
 
-       if ((optind + argcount != argc) || (opt & BB_GETOPT_ERROR)) {
+       if ((optind + argcount) != argc) {
                bb_show_usage();
        }
 
@@ -101,7 +90,7 @@ extern int dpkg_deb_main(int argc, char **argv)
        }
        if (extract_dir) {
                mkdir(extract_dir, 0777);
-               chdir(extract_dir);
+               chdir(extract_dir); /* error check? */
        }
        unpack_ar_archive(ar_archive);