X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fdpkg_deb.c;h=5d814d7ef2e3547998ae8721b9b488d5a9ddb3c3;hb=0d0260fd1e55c39525660370094d090bc5412fe5;hp=77172b0f6d0df85d8880d39bfa4934ed5ec363fb;hpb=eb1c94078f35d1b6e48741122c8bb9426befc5eb;p=oweals%2Fbusybox.git

diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 77172b0f6..5d814d7ef 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -1,124 +1,121 @@
+/* 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 source tree.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <getopt.h>
-#include "busybox.h"
+//usage:#define dpkg_deb_trivial_usage
+//usage:       "[-cefxX] FILE [argument"
+//usage:#define dpkg_deb_full_usage "\n\n"
+//usage:       "Perform actions on Debian packages (.debs)\n"
+//usage:     "\n	-c	List contents of filesystem tree"
+//usage:     "\n	-e	Extract control files to [argument] directory"
+//usage:     "\n	-f	Display control field name starting with [argument]"
+//usage:     "\n	-x	Extract packages filesystem tree to directory"
+//usage:     "\n	-X	Verbose extract"
+//usage:
+//usage:#define dpkg_deb_example_usage
+//usage:       "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
+
+#include "libbb.h"
+#include "archive.h"
+
+#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) MAIN_EXTERNALLY_VISIBLE;
+int dpkg_deb_main(int argc, char **argv)
 {
-	char *prefix = NULL;
-	char *filename = NULL;
-	char *output_buffer = NULL;
-	int opt = 0;
-	int arg_type = 0;
-	int deb_extract_funct = extract_create_dirs;	
-	
-	const int arg_type_prefix = 1;
-	const int arg_type_field = 2;
-	const int arg_type_filename = 4;
-//	const int arg_type_un_ar_gz = 8;
+	archive_handle_t *ar_archive;
+	archive_handle_t *tar_archive;
+	llist_t *control_tar_llist = NULL;
+	unsigned opt;
+	const char *extract_dir;
+	int need_args;
 
-	while ((opt = getopt(argc, argv, "ceftXxI")) != -1) {
-		switch (opt) {
-			case 'c':
-				deb_extract_funct |= extract_data_tar_gz;
-				deb_extract_funct |= extract_verbose_list;
-				break;
-			case 'e':
-				arg_type = arg_type_prefix;
-				deb_extract_funct |= extract_control_tar_gz;
-				deb_extract_funct |= extract_all_to_fs;
-				break;
-			case 'f':
-				arg_type = arg_type_field;
-				deb_extract_funct |= extract_control_tar_gz;
-				deb_extract_funct |= extract_one_to_buffer;
-				filename = xstrdup("./control");
-				break;
-			case 't': /* --fsys-tarfile, i just made up this short name */
-				/* Integrate the functionality needed with some code from ar.c */
-				error_msg_and_die("Option disabled");
-//				arg_type = arg_type_un_ar_gz;
-				break;
-			case 'X':
-				arg_type = arg_type_prefix;
-				deb_extract_funct |= extract_data_tar_gz;
-				deb_extract_funct |= extract_all_to_fs;
-				deb_extract_funct |= extract_list;
-			case 'x':
-				arg_type = arg_type_prefix;
-				deb_extract_funct |= extract_data_tar_gz;
-				deb_extract_funct |= extract_all_to_fs;
-				break;
-			case 'I':
-				arg_type = arg_type_filename;
-				deb_extract_funct |= extract_control_tar_gz;
-				deb_extract_funct |= extract_one_to_buffer;
-				break;
-			default:
-				show_usage();
-		}
-	}
+	/* Setup the tar archive handle */
+	tar_archive = init_handle();
 
-	if (optind == argc)  {
-		show_usage();
-	}
+	/* Setup an ar archive handle that refers to the gzip sub archive */
+	ar_archive = init_handle();
+	ar_archive->dpkg__sub_archive = tar_archive;
+	ar_archive->filter = filter_accept_list_reassign;
+
+#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
+#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
+#if ENABLE_FEATURE_SEAMLESS_LZMA
+	llist_add_to(&ar_archive->accept, (char*)"data.tar.lzma");
+	llist_add_to(&control_tar_llist, (char*)"control.tar.lzma");
+#endif
 
-	/* Workout where to extract the files */
-	if (arg_type == arg_type_prefix) {
-		/* argument is a dir name */
-		if ((optind + 1) == argc ) {
-			prefix = xstrdup("./DEBIAN/");
+	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 (1 == argc) {
+			extract_dir = "./DEBIAN";
 		} else {
-			prefix = (char *) xmalloc(strlen(argv[optind + 1]) + 2);
-			strcpy(prefix, argv[optind + 1]);
-			/* Make sure the directory has a trailing '/' */
-			if (last_char_is(prefix, '/') == NULL) {
-				strcat(prefix, "/");
-			}
+			need_args++;
 		}
 	}
+	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), (char*)"./control");
+		tar_archive->filter = filter_accept_list;
+		tar_archive->action_data = data_extract_to_stdout;
+	}
+	if (opt & DPKG_DEB_OPT_EXTRACT) {
+		tar_archive->action_header = header_list;
+	}
+	if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) {
+		tar_archive->action_data = data_extract_all;
+		need_args = 2;
+	}
 
-	if (arg_type == arg_type_filename) {
-		if ((optind + 1) != argc) {
-			filename = xstrdup(argv[optind + 1]);
-		} else {
-			error_msg_and_die("-I currently requires a filename to be specified");
-		}
+	if (need_args != argc) {
+		bb_show_usage();
 	}
 
-	output_buffer = deb_extract(argv[optind], stdout, deb_extract_funct, prefix, filename);
+	tar_archive->src_fd = ar_archive->src_fd = xopen(argv[0], O_RDONLY);
 
-	if ((arg_type == arg_type_filename) && (output_buffer != NULL)) {
-		puts(output_buffer);
+	/* Work out where to extract the files */
+	/* 2nd argument is a dir name */
+	if (argv[1]) {
+		extract_dir = argv[1];
 	}
-	else if (arg_type == arg_type_field) {
-		char *field = NULL;
-		int field_start = 0;
-
-		while ((field = read_package_field(&output_buffer[field_start])) != NULL) {
-			field_start += (strlen(field) + 1);
-			if (strstr(field, argv[optind + 1]) == field) {
-				puts(field + strlen(argv[optind + 1]) + 2);
-			}
-			free(field);
-		}
+	if (extract_dir) {
+		mkdir(extract_dir, 0777); /* bb_make_directory(extract_dir, 0777, 0) */
+		xchdir(extract_dir);
 	}
 
-	return(EXIT_SUCCESS);
+	/* Do it */
+	unpack_ar_archive(ar_archive);
+
+	/* Cleanup */
+	if (ENABLE_FEATURE_CLEAN_UP)
+		close(ar_archive->src_fd);
+
+	return EXIT_SUCCESS;
 }