--- trunk/mkinitrd-magellan/busybox/archival/dpkg_deb.c	2007/09/01 22:45:15	532
+++ trunk/mkinitrd-magellan/busybox/archival/dpkg_deb.c	2009/04/24 18:33:46	816
@@ -4,7 +4,7 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 #define DPKG_DEB_OPT_CONTENTS	1
@@ -13,14 +13,15 @@
 #define DPKG_DEB_OPT_EXTRACT	8
 #define DPKG_DEB_OPT_EXTRACT_VERBOSE	16
 
+int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dpkg_deb_main(int argc, char **argv)
 {
 	archive_handle_t *ar_archive;
 	archive_handle_t *tar_archive;
 	llist_t *control_tar_llist = NULL;
 	unsigned opt;
-	char *extract_dir = NULL;
-	short argcount = 1;
+	const char *extract_dir;
+	int need_args;
 
 	/* Setup the tar archive handle */
 	tar_archive = init_handle();
@@ -30,29 +31,33 @@
 	ar_archive->sub_archive = tar_archive;
 	ar_archive->filter = filter_accept_list_reassign;
 
-#ifdef CONFIG_FEATURE_DEB_TAR_GZ
-	llist_add_to(&(ar_archive->accept), "data.tar.gz");
-	llist_add_to(&control_tar_llist, "control.tar.gz");
+#if ENABLE_FEATURE_SEAMLESS_GZ
+	llist_add_to(&(ar_archive->accept), (char*)"data.tar.gz");
+	llist_add_to(&control_tar_llist, (char*)"control.tar.gz");
 #endif
 
-#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
-	llist_add_to(&(ar_archive->accept), "data.tar.bz2");
-	llist_add_to(&control_tar_llist, "control.tar.bz2");
+#if ENABLE_FEATURE_SEAMLESS_BZ2
+	llist_add_to(&(ar_archive->accept), (char*)"data.tar.bz2");
+	llist_add_to(&control_tar_llist, (char*)"control.tar.bz2");
 #endif
 
-	opt_complementary = "?c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
-	opt = getopt32(argc, argv, "cefXx");
+	opt_complementary = "c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
+	opt = getopt32(argv, "cefXx");
+	argv += optind;
+	argc -= optind;
 
 	if (opt & DPKG_DEB_OPT_CONTENTS) {
 		tar_archive->action_header = header_verbose_list;
 	}
+	extract_dir = NULL;
+	need_args = 1;
 	if (opt & DPKG_DEB_OPT_CONTROL) {
 		ar_archive->accept = control_tar_llist;
 		tar_archive->action_data = data_extract_all;
-		if (optind + 1 == argc) {
+		if (1 == argc) {
 			extract_dir = "./DEBIAN";
 		} else {
-			argcount++;
+			need_args++;
 		}
 	}
 	if (opt & DPKG_DEB_OPT_FIELD) {
@@ -60,7 +65,7 @@
 		 * it should accept a second argument which specifies a
 		 * specific field to print */
 		ar_archive->accept = control_tar_llist;
-		llist_add_to(&(tar_archive->accept), "./control");
+		llist_add_to(&(tar_archive->accept), (char*)"./control");
 		tar_archive->filter = filter_accept_list;
 		tar_archive->action_data = data_extract_to_stdout;
 	}
@@ -69,28 +74,31 @@
 	}
 	if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) {
 		tar_archive->action_data = data_extract_all;
-		argcount = 2;
+		need_args = 2;
 	}
 
-	if ((optind + argcount) != argc) {
+	if (need_args != argc) {
 		bb_show_usage();
 	}
 
-	tar_archive->src_fd = ar_archive->src_fd = xopen(argv[optind++], O_RDONLY);
+	tar_archive->src_fd = ar_archive->src_fd = xopen(argv[0], O_RDONLY);
 
-	/* Workout where to extract the files */
+	/* Work out where to extract the files */
 	/* 2nd argument is a dir name */
-	if (argv[optind]) {
-		extract_dir = argv[optind];
+	if (argv[1]) {
+		extract_dir = argv[1];
 	}
 	if (extract_dir) {
 		mkdir(extract_dir, 0777); /* bb_make_directory(extract_dir, 0777, 0) */
 		xchdir(extract_dir);
 	}
+
+	/* Do it */
 	unpack_ar_archive(ar_archive);
 
 	/* Cleanup */
-	close(ar_archive->src_fd);
+	if (ENABLE_FEATURE_CLEAN_UP)
+		close(ar_archive->src_fd);
 
 	return EXIT_SUCCESS;
 }