Reorganise archive extraction code

3 files changed, 98 insertions, 120 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 08cd5c501..7359f4910 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -30,36 +30,27 @@
 
 extern int ar_main(int argc, char **argv)
 {
-	const int preserve_date = 1;	/* preserve original dates */
-	const int verbose = 2;		/* be verbose */
-	const int display = 4;		/* display contents */
-	const int extract_to_file = 8;	/* extract contents of archive */
-	const int extract_to_stdout = 16;	/* extract to stdout */
-
-	FILE *src_file = NULL, *dst_file = NULL;
-	int funct = 0, opt=0;
-
-	ar_headers_t *head, *ar_extract_list=NULL;
-
-	ar_extract_list = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t));
-	head = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t));
+	FILE *src_stream = NULL;
+	int extract_function = 0, opt = 0;
+	file_headers_t *head;
+	file_headers_t *ar_extract_list = NULL;
 
 	while ((opt = getopt(argc, argv, "ovtpx")) != -1) {
 		switch (opt) {
 		case 'o':
-			funct |= preserve_date;
+			extract_function |= extract_preserve_date;
 			break;
 		case 'v':
-			funct |= verbose;
+			extract_function |= extract_verbose_list;
 			break;
 		case 't':
-			funct |= display;
+			extract_function |= extract_list;
 			break;
 		case 'p':
-			funct |= extract_to_stdout;
+			extract_function |= extract_to_stdout;
 			break;
 		case 'x':
-			funct |= extract_to_file;
+			extract_function |= extract_all_to_fs;
 			break;
 		default:
 			show_usage();
@@ -71,57 +62,28 @@ extern int ar_main(int argc, char **argv)
 		show_usage();
 	}
 
-	if ( (src_file = wfopen(argv[optind], "r")) < 0) {
-		error_msg_and_die("Cannot read %s", argv[optind]);
-	}
+	src_stream = xfopen(argv[optind++], "r");
+	head = get_ar_headers(src_stream);
 
-	optind++;	
-	head = get_ar_headers(src_file);
 	/* find files to extract or display */
 	/* search through argv and build extract list */
-	for (;optind < argc; optind++) {
-		ar_headers_t *ar_entry;
-		ar_entry = (ar_headers_t *) xcalloc(1, sizeof(ar_headers_t));
-		ar_entry = head;
-		while (ar_entry->next != NULL) {
-			if (strcmp(argv[optind], ar_entry->name) == 0) {
-				ar_headers_t *tmp;
-				tmp = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));
-				*tmp = *ar_extract_list;
-				*ar_extract_list = *ar_entry;
-				ar_extract_list->next = tmp;
-				break;					
-			}
-			ar_entry=ar_entry->next;
+	ar_extract_list = (file_headers_t *) xcalloc(1, sizeof(file_headers_t));
+	if (optind < argc) {
+		while (optind < argc) {
+			ar_extract_list = add_from_archive_list(head, ar_extract_list, argv[optind]);
+			optind++;
 		}
-	}
-
-	/* if individual files not found extract all files */	
-	if (ar_extract_list->next==NULL) {
+	} else {
 		ar_extract_list = head;
 	}
 
-	/* find files to extract or display */	
-	while (ar_extract_list->next != NULL) {
-		if (funct & extract_to_file) {
-			dst_file = wfopen(ar_extract_list->name, "w");				
-		}
-		else if (funct & extract_to_stdout) {
-			dst_file = stdout;
-		}
-		if ((funct & extract_to_file) || (funct & extract_to_stdout)) {
-			fseek(src_file, ar_extract_list->offset, SEEK_SET);
-			copy_file_chunk(src_file, dst_file, ar_extract_list->size);			
-		}
-		if (funct & verbose) {
-			printf("%s %d/%d %8d %s ", mode_string(ar_extract_list->mode), 
-				ar_extract_list->uid, ar_extract_list->gid,
-				(int) ar_extract_list->size, time_string(ar_extract_list->mtime));
-		}
-		if ((funct & display) || (funct & verbose)){
-			puts(ar_extract_list->name);
-		}
-		ar_extract_list = ar_extract_list->next;
-	}
+	/* If there isnt even one possible entry then abort */
+	if (ar_extract_list->name == NULL) {
+		error_msg_and_die("No files to extract");
+	}	
+
+	fseek(src_stream, 0, SEEK_SET);
+	extract_archive(src_stream, stdout, ar_extract_list, extract_function, "./");
+
 	return EXIT_SUCCESS;
 }
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 0010df537..4224672ec 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -13,7 +13,6 @@
 
 #include "busybox.h"
 
-
 #define DEPENDSMAX	64	/* maximum number of depends we can handle */
 
 /* Should we do full dependency checking? */
@@ -487,7 +486,7 @@ static void *status_read(void)
 		return(NULL);
 	}
 
-	while ( (package_control_buffer = read_text_file_to_buffer(f)) != NULL) {
+	while ( (package_control_buffer = fgets_str(f, "\n\n")) != NULL) {
 		m = (package_t *)xcalloc(1, sizeof(package_t));
 		fill_package_struct(m, package_control_buffer);
 		if (m->package) {
@@ -650,24 +649,26 @@ static int dpkg_doconfigure(package_t *pkg)
 
 static int dpkg_dounpack(package_t *pkg)
 {
-	int r = 0;
+	FILE *out_stream;
+	char *info_prefix;
 	int status = TRUE;
-	char *lst_path;
+	int r = 0;
 
 	DPRINTF("Unpacking %s\n", pkg->package);
 
 	/* extract the data file */
-	deb_extract(pkg->filename, extract_extract, "/", NULL);
+	deb_extract(pkg->filename, stdout, (extract_data_tar_gz | extract_all_to_fs), "/", NULL);
 
 	/* extract the control files */
-	deb_extract(pkg->filename, extract_control, infodir, pkg->package);
+	info_prefix = (char *) malloc(strlen(pkg->package) + strlen(infodir) + 2 + 5 + 1);
+	sprintf(info_prefix, "%s/%s.", infodir, pkg->package);
+	deb_extract(pkg->package, stdout, (extract_control_tar_gz | extract_all_to_fs), info_prefix, NULL);
 
 	/* Create the list file */
-	lst_path = xmalloc(strlen(infodir) + strlen(pkg->package) + 6);
-	strcpy(lst_path, infodir);
-	strcat(lst_path, pkg->package);
-	strcat(lst_path, ".list");
-	deb_extract(pkg->filename, extract_contents_to_file, lst_path, NULL);
+	strcat(info_prefix, "list");
+	out_stream = wfopen(info_prefix, "w");			
+	deb_extract(pkg->package, out_stream, (extract_data_tar_gz | extract_list), NULL, NULL);
+	fclose(out_stream);
 
 	pkg->state_want = state_want_install;
 	pkg->state_flag = state_flag_ok;
@@ -692,7 +693,7 @@ static int dpkg_read_control(package_t *pkg)
 	if ((pkg_file = wfopen(pkg->filename, "r")) == NULL) {
 		return EXIT_FAILURE;
 	}
-	control_buffer = deb_extract(pkg->filename, extract_field, NULL, NULL);
+	control_buffer = deb_extract(pkg->filename, stdout, (extract_control_tar_gz | extract_one_to_buffer), NULL, "./control");
 	fill_package_struct(pkg, control_buffer);
 	return EXIT_SUCCESS;
 }
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 17b5476d0..400f2385a 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -21,33 +21,54 @@
 
 extern int dpkg_deb_main(int argc, char **argv)
 {
-	char *argument = NULL;
+	char *prefix = NULL;
+	char *filename = NULL;
 	char *output_buffer = NULL;
 	int opt = 0;
-	int optflag = 0;	
+	int arg_type = 0;
+	int deb_extract_funct = 0;	
 	
+	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;
+
 	while ((opt = getopt(argc, argv, "ceftXxI")) != -1) {
 		switch (opt) {
 			case 'c':
-				optflag |= extract_contents;
+				deb_extract_funct |= extract_data_tar_gz;
+				deb_extract_funct |= extract_verbose_list;
 				break;
 			case 'e':
-				optflag |= extract_control;
+				arg_type = arg_type_prefix;
+				deb_extract_funct |= extract_control_tar_gz;
+				deb_extract_funct |= extract_all_to_fs;
 				break;
 			case 'f':
-				optflag |= extract_field;
+				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':
-				optflag |= extract_fsys_tarfile;
+			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':
-				optflag |= extract_verbose_extract;
-				break;
+				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':
-				optflag |= extract_extract;
+				arg_type = arg_type_prefix;
+				deb_extract_funct |= extract_data_tar_gz;
+				deb_extract_funct |= extract_all_to_fs;
 				break;
 			case 'I':
-				optflag |= extract_info;
+				arg_type = arg_type_filename;
+				deb_extract_funct |= extract_control_tar_gz;
+				deb_extract_funct |= extract_one_to_buffer;
 				break;
 			default:
 				show_usage();
@@ -58,48 +79,42 @@ extern int dpkg_deb_main(int argc, char **argv)
 		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);
+	/* Workout where to extract the files */
+	if (arg_type == arg_type_prefix) {
+		/* argument is a dir name */
+		if ((optind + 1) == argc ) {
+			prefix = xstrdup("./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, "/");
 			}
-			/* argument is a filename */
-		default:
+		}
 	}
 
-	output_buffer = deb_extract(argv[optind], optflag, argument, NULL);
+	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 (optflag & extract_field) {
+	output_buffer = deb_extract(argv[optind], stdout, deb_extract_funct, prefix, filename);
+
+	if ((arg_type == arg_type_filename) && (output_buffer != NULL)) {
+		puts(output_buffer);
+	}
+	else if (arg_type == arg_type_field) {
 		char *field = NULL;
-		int field_length = 0;
 		int field_start = 0;
 
 		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);
+			field_start += (strlen(field) + 1);
+			if (strstr(field, argv[optind + 1]) == field) {
+				puts(field + strlen(argv[optind + 1]) + 2);
 			}
 			free(field);
 		}