X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fdpkg_deb.c;h=2d7383fd7988f62b2844ca8d27312dc8bed80b24;hb=56f16b42c93af18fbb984e8d6384c03e5405e3ae;hp=450b04b8ed943365bf0673f607c3d0c1d541d9cc;hpb=d22e560ad6a3fe8bfbd23519935a1942cd510758;p=oweals%2Fbusybox.git

diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 450b04b8e..2d7383fd7 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -13,69 +13,95 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
+#include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <getopt.h>
+#include "unarchive.h"
 #include "busybox.h"
 
 extern int dpkg_deb_main(int argc, char **argv)
 {
-	const int dpkg_deb_contents = 1;
-	const int dpkg_deb_control = 2;
-//	const int dpkg_deb_info = 4;
-	const int dpkg_deb_extract = 8;
-	const int dpkg_deb_verbose_extract = 16;
-	const int dpkg_deb_list = 32;
-	char *target_dir = NULL;
+	archive_handle_t *ar_archive;
+	archive_handle_t *tar_archive;
 	int opt = 0;
-	int optflag = 0;	
+#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
+	llist_t *control_tar_llist = NULL;
+#endif
 	
-	while ((opt = getopt(argc, argv, "cexXl")) != -1) {
+	/* Setup the tar archive handle */
+	tar_archive = init_handle();
+
+	/* Setup an ar archive handle that refers to the gzip sub archive */	
+	ar_archive = init_handle();
+	ar_archive->sub_archive = tar_archive;
+	ar_archive->filter = filter_accept_list_reassign;
+
+#ifdef CONFIG_FEATURE_DEB_TAR_GZ
+	ar_archive->accept = llist_add_to(NULL, "data.tar.gz");
+# ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
+	control_tar_llist = llist_add_to(NULL, "control.tar.gz");
+# endif
+#endif
+
+#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
+	ar_archive->accept = llist_add_to(ar_archive->accept, "data.tar.bz2");
+# ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
+	control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2");
+# endif
+#endif
+
+#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
+	while ((opt = getopt(argc, argv, "cefXx")) != -1) {
+#else
+	while ((opt = getopt(argc, argv, "x")) != -1) {
+#endif
 		switch (opt) {
+#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
 			case 'c':
-				optflag |= dpkg_deb_contents;
+				tar_archive->action_header = header_verbose_list;
 				break;
 			case 'e':
-				optflag |= dpkg_deb_control;
+				ar_archive->accept = control_tar_llist;
+				tar_archive->action_data = data_extract_all;
 				break;
-			case 'X':
-				optflag |= dpkg_deb_verbose_extract;
+			case 'f':
+				/* Print the entire control file
+				 * 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");;
+				tar_archive->filter = filter_accept_list;
+				tar_archive->action_data = data_extract_to_stdout;
 				break;
+			case 'X':
+				tar_archive->action_header = header_list;
+#endif
 			case 'x':
-				optflag |= dpkg_deb_extract;
-				break;
-			case 'l':
-				optflag |= dpkg_deb_list;
-				break;
-/*			case 'I':
-				optflag |= dpkg_deb_info;
+				tar_archive->action_data = data_extract_all;
 				break;
-*/
 			default:
-				show_usage();
+				bb_show_usage();
 		}
 	}
 
-	if (((optind + 1 ) > argc) || (optflag == 0))  {
-		show_usage();
+	if (optind + 2 < argc)  {
+		bb_show_usage();
 	}
-	if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) {
-		if ( (optind + 1) == argc ) {
-			target_dir = (char *) xmalloc(7);
-			strcpy(target_dir, "DEBIAN");
-		} else {
-			target_dir = (char *) xmalloc(strlen(argv[optind + 1]));
-			strcpy(target_dir, argv[optind + 1]);
-		}
-	}
-	deb_extract(optflag, target_dir, argv[optind]);
-/*	else if (optflag & dpkg_deb_info) {
-		extract_flag = TRUE;
-		extract_to_stdout = TRUE;
-		strcpy(ar_filename, "control.tar.gz");
-		extract_list = argv+optind+1;
-		printf("list one is [%s]\n",extract_list[0]);
-	}
-*/
+
+	tar_archive->src_fd = ar_archive->src_fd = bb_xopen(argv[optind++], O_RDONLY);
+
+	/* Workout where to extract the files */
+	/* 2nd argument is a dir name */
+	mkdir(argv[optind], 0777);
+	chdir(argv[optind]);
+
+	unpack_ar_archive(ar_archive);
+
+	/* Cleanup */
+	close (ar_archive->src_fd);
+
 	return(EXIT_SUCCESS);
 }
+