Reorganise archive extraction code

1 files changed, 61 insertions, 35 deletions

diff --git a/libbb/deb_extract.c b/libbb/deb_extract.c
index 36cebfa51..f64193970 100644
--- a/libbb/deb_extract.c
+++ b/libbb/deb_extract.c
@@ -27,71 +27,97 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <signal.h>
 #include "libbb.h"
 
+int seek_sub_file(FILE *in_file, file_headers_t *headers, const char *tar_gz_file)
+{
+	/* find the headers for the specified .tar.gz file */
+	while (headers != NULL) {
+		if (strcmp(headers->name, tar_gz_file) == 0) {
+			fseek(in_file, headers->offset, SEEK_SET);
+			return(EXIT_SUCCESS);
+		}
+		headers = headers->next;
+	}
+
+	return(EXIT_FAILURE);
+}
+
 /*
  * The contents of argument depend on the value of function.
  * It is either a dir name or a control file or field name(see dpkg_deb.c)
  */
-extern char *deb_extract(const char *package_filename, const int function, const char *argument, const char *argument2)
+char *deb_extract(const char *package_filename, FILE *out_stream, const int extract_function,
+	const char *prefix, const char *filename)
 {
+	FILE *deb_stream, *uncompressed_stream;
+	file_headers_t *ar_headers = NULL;
+	file_headers_t *tar_headers = NULL;
+	file_headers_t *list_ptr;
+	file_headers_t *deb_extract_list = (file_headers_t *) calloc(1, sizeof(file_headers_t));
 
-	FILE *deb_file, *uncompressed_file;
-	ar_headers_t *headers = NULL;
 	char *ared_file = NULL;
 	char *output_buffer = NULL;
 	int gunzip_pid;
 
-	switch (function) {
-		case (extract_info):
-		case (extract_control):
-		case (extract_field):
-			ared_file = xstrdup("control.tar.gz");
-			break;
-		default:
-			ared_file = xstrdup("data.tar.gz");
-			break;
+	if (extract_function & extract_control_tar_gz) {
+		ared_file = xstrdup("control.tar.gz");
+	}
+	else if (extract_function & extract_data_tar_gz) {		
+		ared_file = xstrdup("data.tar.gz");
 	}
 
 	/* open the debian package to be worked on */
-	deb_file = wfopen(package_filename, "r");
+	deb_stream = wfopen(package_filename, "r");
 
-	headers = (ar_headers_t *) xmalloc(sizeof(ar_headers_t));	
+	ar_headers = (file_headers_t *) xmalloc(sizeof(file_headers_t));	
 	
 	/* get a linked list of all ar entries */
-	if ((headers = get_ar_headers(deb_file)) == NULL) {
+	ar_headers = get_ar_headers(deb_stream);
+	if (ar_headers == NULL) {
 		error_msg("Couldnt get ar headers\n");
 		return(NULL);
 	}
 
 	/* seek to the start of the .tar.gz file within the ar file*/
-	if (seek_ared_file(deb_file, headers, ared_file) == EXIT_FAILURE) {
-		error_msg("Couldnt seek to ar file");
+	fseek(deb_stream, 0, SEEK_SET);
+	if (seek_sub_file(deb_stream, ar_headers, ared_file) == EXIT_FAILURE) {
+		error_msg("Couldnt seek to file %s", ared_file);
 	}
 
-	/* open a stream of decompressed data */
-	uncompressed_file = fdopen(gz_open(deb_file, &gunzip_pid), "r");
-
-	if (function & extract_fsys_tarfile) {
-		copy_file_chunk(uncompressed_file, stdout, -1);
-	} else {
-		FILE *output;
+	/* get a linked list of all tar entries */
+	tar_headers = get_tar_gz_headers(deb_stream);
+	if (tar_headers == NULL) {
+		error_msg("Couldnt get tar headers\n");
+		return(NULL);
+	}
 
-		if (function & extract_contents_to_file) {
-			output = wfopen(argument, "w");
-		} else {
-			output = stdout;
+	if (extract_function & extract_one_to_buffer) {
+		list_ptr = tar_headers;
+		while (list_ptr != NULL) {
+			if (strcmp(filename, list_ptr->name) == 0) {
+				deb_extract_list = append_archive_list(deb_extract_list, list_ptr);
+				break;
+			}
+			list_ptr = list_ptr->next;
 		}
+	} else {
+		deb_extract_list = tar_headers;
+	}
 
-		output_buffer = untar(uncompressed_file, output, function, argument, argument2);
-		if (output != stdout) {
-			fclose(output);
-		}
+	/* seek to the start of the .tar.gz file within the ar file*/
+	if (seek_sub_file(deb_stream, ar_headers, ared_file) == EXIT_FAILURE) {
+		error_msg("Couldnt seek to ar file");
 	}
+
+	/* open a stream of decompressed data */
+	uncompressed_stream = fdopen(gz_open(deb_stream, &gunzip_pid), "r");
+
+	output_buffer = extract_archive(uncompressed_stream, out_stream, deb_extract_list, extract_function, prefix);
+
 	gz_close(gunzip_pid);
-	fclose(deb_file);
-	fclose(uncompressed_file);
+	fclose(deb_stream);
+	fclose(uncompressed_stream);
 	free(ared_file);
 
 	return(output_buffer);