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

diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 17b5476d0..2d7383fd7 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -13,97 +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)
 {
-	char *argument = NULL;
-	char *output_buffer = 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, "ceftXxI")) != -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 |= extract_contents;
+				tar_archive->action_header = header_verbose_list;
 				break;
 			case 'e':
-				optflag |= extract_control;
+				ar_archive->accept = control_tar_llist;
+				tar_archive->action_data = data_extract_all;
 				break;
 			case 'f':
-				optflag |= extract_field;
-				break;
-			case 't':
-				optflag |= extract_fsys_tarfile;
+				/* 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':
-				optflag |= extract_verbose_extract;
-				break;
+				tar_archive->action_header = header_list;
+#endif
 			case 'x':
-				optflag |= extract_extract;
-				break;
-			case 'I':
-				optflag |= extract_info;
+				tar_archive->action_data = data_extract_all;
 				break;
 			default:
-				show_usage();
+				bb_show_usage();
 		}
 	}
 
-	if (optind == argc)  {
-		show_usage();
+	if (optind + 2 < argc)  {
+		bb_show_usage();
 	}
 
-	switch (optflag) {
-		case (extract_control):
-		case (extract_extract):
-		case (extract_verbose_extract):
-			/* argument is a dir name */
-			if ( (optind + 1) == argc ) {
-				argument = xstrdup("DEBIAN");
-			} else {
-				argument = xstrdup(argv[optind + 1]);
-			}
-			break;
-		case (extract_field):
-			/* argument is a control field name */
-			if ((optind + 1) != argc) {
-				argument = xstrdup(argv[optind + 1]);				
-			}
-			break;
-		case (extract_info):
-			/* argument is a control field name */
-			if ((optind + 1) != argc) {
-				argument = xstrdup(argv[optind + 1]);
-				break;
-			} else {
-				error_msg("-I currently requires a filename to be specifies");
-				return(EXIT_FAILURE);
-			}
-			/* argument is a filename */
-		default:
-	}
+	tar_archive->src_fd = ar_archive->src_fd = bb_xopen(argv[optind++], O_RDONLY);
 
-	output_buffer = deb_extract(argv[optind], optflag, argument, NULL);
+	/* Workout where to extract the files */
+	/* 2nd argument is a dir name */
+	mkdir(argv[optind], 0777);
+	chdir(argv[optind]);
 
-	if (optflag & extract_field) {
-		char *field = NULL;
-		int field_length = 0;
-		int field_start = 0;
+	unpack_ar_archive(ar_archive);
 
-		while ((field = read_package_field(&output_buffer[field_start])) != NULL) {
-			field_length = strlen(field);
-			field_start += (field_length + 1);
-			if (strstr(field, argument) == field) {
-				puts(field + strlen(argument) + 2);
-			}
-			free(field);
-		}
-	}
+	/* Cleanup */
+	close (ar_archive->src_fd);
 
 	return(EXIT_SUCCESS);
 }
+