From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Fri, 12 Sep 2003 06:49:09 +0000 (-0000)
Subject: Fix handling of hardlinks when OLDGNU and GNU extensions arent enabled.
X-Git-Tag: 1_00_pre3~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=beb3bbd991c6c4c988763af7d1a95618094097d2;p=oweals%2Fbusybox.git

Fix handling of hardlinks when OLDGNU and GNU extensions arent enabled.
---

diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index b66bd322b..cf5ac6b62 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -53,7 +53,6 @@ extern char get_header_tar(archive_handle_t *archive_handle)
 	} tar;
 	long sum = 0;
 	long i;
-	char *tmp;
 
 	/* Align header */
 	data_align(archive_handle, 512);
@@ -117,7 +116,6 @@ extern char get_header_tar(archive_handle_t *archive_handle)
 	file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) +
 				 strtol(tar.formated.devminor, NULL, 8));
 
-#if defined CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY || defined CONFIG_FEATURE_TAR_GNU_EXTENSIONS
 	/* Fix mode, used by the old format */
 	switch (tar.formated.typeflag) {
 # ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
@@ -176,7 +174,6 @@ extern char get_header_tar(archive_handle_t *archive_handle)
 		bb_error_msg("Ignoring GNU extension type %c", tar.formated.typeflag);
 # endif
 	}
-#endif
 
 	if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
 		archive_handle->action_header(archive_handle->file_header);