X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fdpkg_deb.c;h=80a5f3250c84293dd58f9635bf4808077f0b0b2e;hb=5e618ff4393019ee24765877d49cb9001f7df992;hp=3a789379b439217d7be5b69e392d49db4ab7572d;hpb=ed3ef50c233ffb1b50ea0e7382a8e60b86491009;p=oweals%2Fbusybox.git

diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 3a789379b..80a5f3250 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -1,163 +1,96 @@
+/* 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.
+ * dpkg-deb packs, unpacks and provides information about Debian archives.
  *
- *  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.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 #include "busybox.h"
+#include "unarchive.h"
 
-typedef struct ar_headers_s {
-	char *name;
-	size_t size;
-	uid_t uid;
-	gid_t gid;
-	mode_t mode;
-	time_t mtime;
-	off_t offset;
-	struct ar_headers_s *next;
-} ar_headers_t;
-
-extern ar_headers_t get_headers(int srcFd);
-extern int tar_unzip_init(int tarFd);
-extern int readTarFile(int tarFd, int extractFlag, int listFlag, 
-		int tostdoutFlag, int verboseFlag, char** extractList,
-		char** excludeList);
+#define DPKG_DEB_OPT_CONTENTS	1
+#define DPKG_DEB_OPT_CONTROL	2
+#define DPKG_DEB_OPT_FIELD	4
+#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)
 {
-	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;
-	int opt=0;
-	int optflag=0;	
-	int extract_flag = FALSE;
-	int list_flag = FALSE;
-	int verbose_flag = FALSE;
-	int extract_to_stdout = FALSE;
-	char ar_filename[15];
-	int srcFd=0;
-	int status=0;
-	ar_headers_t *ar_headers = NULL;
-	char **extract_list=NULL;
-	char *target_dir=NULL;
-	
-	while ((opt = getopt(argc, argv, "cexX")) != -1) {
-		switch (opt) {
-			case 'c':
-				optflag |= dpkg_deb_contents;
-				break;
-			case 'e':
-				optflag |= dpkg_deb_control;
-				break;
-/*			case 'I':
-				optflag |= dpkg_deb_info;
-				break;
-*/
-			case 'x':
-				optflag |= dpkg_deb_extract;
-				break;
-			case 'X':
-				optflag |= dpkg_deb_verbose_extract;
-				break;
-			default:
-				usage(dpkg_deb_usage);
-				return EXIT_FAILURE;
-		}
-	}
+	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;
+
+	/* 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
+	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
+	llist_add_to(&(ar_archive->accept), "data.tar.bz2");
+	llist_add_to(&control_tar_llist, "control.tar.bz2");
+#endif
+
+	opt_complementary = "?c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
+	opt = getopt32(argc, argv, "cefXx");
 
-	if (((optind + 1 ) > argc) || (optflag == 0))  {
-		usage(dpkg_deb_usage);
-		return(EXIT_FAILURE);
+	if (opt & DPKG_DEB_OPT_CONTENTS) {
+		tar_archive->action_header = header_verbose_list;
 	}
-	
-	if (optflag & dpkg_deb_contents) {
-		list_flag = TRUE;
-		verbose_flag = TRUE;
-		strcpy(ar_filename, "data.tar.gz");
+	if (opt & DPKG_DEB_OPT_CONTROL) {
+		ar_archive->accept = control_tar_llist;
+		tar_archive->action_data = data_extract_all;
+		if (optind + 1 == argc) {
+			extract_dir = "./DEBIAN";
+		} else {
+			argcount++;
+		}
 	}
-	else if (optflag & dpkg_deb_control) {
-		extract_flag = TRUE;
-		strcpy(ar_filename, "control.tar.gz");		
-                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]);
-                }
+	if (opt & DPKG_DEB_OPT_FIELD) {
+		/* Print the entire control file
+		 * 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");
+		tar_archive->filter = filter_accept_list;
+		tar_archive->action_data = data_extract_to_stdout;
 	}
-/*	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]);
+	if (opt & DPKG_DEB_OPT_EXTRACT) {
+		tar_archive->action_header = header_list;
 	}
-*/
-	else if (optflag & dpkg_deb_extract) {
-		extract_flag = TRUE;
-		strcpy(ar_filename, "data.tar.gz");
-		if ( (optind + 2) > argc ) {
-			error_msg_and_die("No directory specified\n");
-		}
-		target_dir = (char *) xmalloc(strlen(argv[optind+1]));			
-		strcpy(target_dir, argv[optind+1]);
-	}	
-	else if (optflag & dpkg_deb_verbose_extract) {
-		extract_flag = TRUE;
-		list_flag = TRUE;
-		strcpy(ar_filename, "data.tar.gz");
-		if ( (optind + 2) > argc ) {
-			error_msg_and_die("No directory specified\n");
-		}
-		target_dir = (char *) xmalloc(strlen(argv[optind+1]));			
-		strcpy(target_dir, argv[optind+1]);
+	if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) {
+		tar_archive->action_data = data_extract_all;
+		argcount = 2;
 	}
-		
-	ar_headers = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));	
-	srcFd = open(argv[optind], O_RDONLY);
-	
-	*ar_headers = get_headers(srcFd);
-	if (ar_headers->next==NULL)
-		error_msg_and_die("Couldnt find %s in %s\n",ar_filename, argv[optind]);
 
-	while (ar_headers->next != NULL) {
-		if (strcmp(ar_headers->name, ar_filename)==0)
-			break;
-		ar_headers = ar_headers->next;
+	if ((optind + argcount) != argc) {
+		bb_show_usage();
 	}
 
-	lseek(srcFd, ar_headers->offset, SEEK_SET);
-	srcFd = tar_unzip_init(srcFd);
-	if ( target_dir != NULL) { 
-		if (is_directory(target_dir, TRUE, NULL)==FALSE) {
-			mkdir(target_dir, 0755);
-		}
-		if (chdir(target_dir)==-1) {
-			error_msg_and_die("Cannot change to dir %s\n",argv[optind+1]);
-		}
+	tar_archive->src_fd = ar_archive->src_fd = xopen(argv[optind++], O_RDONLY);
+
+	/* Workout where to extract the files */
+	/* 2nd argument is a dir name */
+	if (argv[optind]) {
+		extract_dir = argv[optind];
+	}
+	if (extract_dir) {
+		mkdir(extract_dir, 0777); /* bb_make_directory(extract_dir, 0777, 0) */
+		xchdir(extract_dir);
 	}
-	status = readTarFile(srcFd, extract_flag, list_flag, extract_to_stdout, verbose_flag, NULL, extract_list);
-	close (srcFd);
+	unpack_ar_archive(ar_archive);
+
+	/* Cleanup */
+	close (ar_archive->src_fd);
+
 	return(EXIT_SUCCESS);
 }