Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge

Conflicts:
	include/platform.h

2 files changed, 14 insertions, 4 deletions

diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index f73cd338e..79caff55a 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -348,10 +348,20 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         /* Set bits 12-15 of the files mode */
         /* (typeflag was not trashed because chksum does not use getOctal) */
         switch (tar.typeflag) {
-        /* busybox identifies hard links as being regular files with 0 size and a link name */
-        case '1':
+        case '1': /* hardlink */
+                /* we mark hardlinks as regular files with zero size and a link name */
                 file_header->mode |= S_IFREG;
-                break;
+                /* on size of link fields from star(4)
+                 * ... For tar archives written by pre POSIX.1-1988
+                 * implementations, the size field usually contains the size of
+                 * the file and needs to be ignored as no data may follow this
+                 * header type.  For POSIX.1- 1988 compliant archives, the size
+                 * field needs to be 0.  For POSIX.1-2001 compliant archives,
+                 * the size field may be non zero, indicating that file data is
+                 * included in the archive.
+                 * i.e; always assume this is zero for safety.
+                 */
+                goto size0;
         case '7':
         /* case 0: */
         case '0':
diff --git a/archival/tar.c b/archival/tar.c
index 612b2119b..e7963b0b4 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -926,7 +926,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         /* Prepend '-' to the first argument if required */
         opt_complementary = "--:" // first arg is options
                 "tt:vv:" // count -t,-v
-                "X::T::" // cumulative lists
+                IF_FEATURE_TAR_FROM("X::T::") // cumulative lists
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
                 "\xff::" // cumulative lists for --exclude
 #endif