From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Sat, 21 Apr 2001 02:12:13 +0000 (-0000)
Subject: Clearly define out exclude list code, as recommended by Larry Doolittle
X-Git-Tag: 0_52~319
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=89dc02d94480ffc10e81d91f3c17ddff25530f18;p=oweals%2Fbusybox.git

Clearly define out exclude list code, as recommended by Larry Doolittle
---

diff --git a/libbb/untar.c b/libbb/untar.c
index a77d94f61..70f7eb6a6 100644
--- a/libbb/untar.c
+++ b/libbb/untar.c
@@ -103,7 +103,8 @@ extern char *untar(FILE *src_tar_file, FILE *output, const int untar_function,
 			next_header_offset += (512 - size % 512);
 		}
 
-		/* If an exclude list is specified check current file against list 
+		/* If an exclude list is specified check current file against list */
+#if 0
 		if (*exclude_list != NULL) {
 			i = 0;
 			while (exclude_list[i] != 0) {
@@ -115,8 +116,8 @@ extern char *untar(FILE *src_tar_file, FILE *output, const int untar_function,
 		if (exclude_list[i] != 0) {
 				continue;
 			}
-		} */
-
+		}
+#endif
 		if (untar_function & (extract_contents | extract_verbose_extract | extract_contents_to_file)) {
 			fprintf(output, "%s\n", raw_tar_header.name);
 		}
@@ -152,7 +153,7 @@ extern char *untar(FILE *src_tar_file, FILE *output, const int untar_function,
 									strcat(file_name, ".");
 									strcat(file_name, file_extension);
 
-									full_name = concat_path_file(strndup(dir, strlen(dir) - strlen(strrchr(dir, '/'))), file_name);
+									full_name = concat_path_file(xstrndup(dir, strlen(dir) - strlen(strrchr(dir, '/'))), file_name);
 								} else {
 									full_name = xstrdup(dir);
 								}