From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Sat, 4 Aug 2001 05:28:29 +0000 (-0000)
Subject: Fix exclude list handling
X-Git-Tag: 0_60_1~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b373a8d0ca73acfc042a9741f8e3f803dc1cefa3;p=oweals%2Fbusybox.git

Fix exclude list handling
---

diff --git a/libbb/unarchive.c b/libbb/unarchive.c
index 91db2e3b1..0d414a3a8 100644
--- a/libbb/unarchive.c
+++ b/libbb/unarchive.c
@@ -230,24 +230,35 @@ char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_headers
 	const int extract_function, const char *prefix, char **extract_names)
 {
 	file_header_t *file_entry;
-	int found;
+	int extract_flag;
 	int i;
 	char *buffer = NULL;
 
 	archive_offset = 0;
 	while ((file_entry = get_headers(src_stream)) != NULL) {
-		found = FALSE;
-		if (extract_names == NULL) {
-			found = TRUE;
-		} else {
+		extract_flag = TRUE;
+		if (extract_names != NULL) {
+			int found_flag = FALSE;
 			for(i = 0; extract_names[i] != 0; i++) {
 				if (strcmp(extract_names[i], file_entry->name) == 0) {
-					found = TRUE;
+					found_flag = TRUE;
+					break;
+				}
+			}
+			if (extract_function & extract_exclude_list) {
+				if (found_flag == TRUE) {
+					extract_flag = FALSE;
+				}
+			} else {
+				/* If its not found in the include list dont extract it */
+				if (found_flag == FALSE) {
+					extract_flag = FALSE;
 				}
 			}
+
 		}
 
-		if (found) {
+		if (extract_flag == TRUE) {
 			buffer = extract_archive(src_stream, out_stream, file_entry, extract_function, prefix);
 		} else {
 			/* seek past the data entry */