From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Thu, 27 Nov 2003 00:01:43 +0000 (-0000)
Subject: Fix tar hard links
X-Git-Tag: 1_00_pre4~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e39ee01821d537b3b249b0c136bb150734016c35;p=oweals%2Fbusybox.git

Fix tar hard links
---

diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index bf3be5b35..b77cd11ae 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -66,8 +66,9 @@ extern void data_extract_all(archive_handle_t *archive_handle)
 		}
 	}
 
-	/* Handle hard links seperately */
-	if (!S_ISLNK(file_header->mode) && (file_header->link_name) && (file_header->size == 0)) {
+	/* Handle hard links seperately 
+	 * We identified hard links as regular files of size 0 with a symlink */
+	if (S_ISREG(file_header->mode) && (file_header->link_name) && (file_header->size == 0)) {
 		/* hard link */
 		res = link(file_header->link_name, file_header->name);
 		if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index 603535a4c..561de1c03 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -151,10 +151,9 @@ extern char get_header_tar(archive_handle_t *archive_handle)
 		file_header->mode |= S_IFIFO;
 		break;
 # endif
-	/* hard links are detected as entries with 0 size, a link name, 
-	 * and not being a symlink, hence we have nothing to do here */
+	/* hard links are detected as regular files with 0 size and a link name */
 	case '1':
-		file_header->mode |= ~S_IFLNK;
+		file_header->mode &= (S_IFREG | 07777);
 		break;
 # ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
 	case 'L': {