Merge branch 'busybox' into mergeFRP

2 files changed, 24 insertions, 11 deletions

diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 2dbcdb50c..fb68673b9 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -350,7 +350,14 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         case '6':
                 file_header->mode |= S_IFIFO;
                 goto size0;
+        case 'g':       /* pax global header */
+        case 'x': {     /* pax extended header */
+                if ((uoff_t)file_header->size > 0xfffff) /* paranoia */
+                        goto skip_ext_hdr;
+                process_pax_hdr(archive_handle, file_header->size, (tar.typeflag == 'g'));
+                goto again_after_align;
 #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+/* See http://www.gnu.org/software/tar/manual/html_node/Extensions.html */
         case 'L':
                 /* free: paranoia: tar with several consecutive longnames */
                 free(p_longname);
@@ -370,18 +377,17 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
                 archive_handle->offset += file_header->size;
                 /* return get_header_tar(archive_handle); */
                 goto again;
-        case 'D':       /* GNU dump dir */
-        case 'M':       /* Continuation of multi volume archive */
-        case 'N':       /* Old GNU for names > 100 characters */
-        case 'S':       /* Sparse file */
-        case 'V':       /* Volume header */
+/*
+ *      case 'S':       // Sparse file
+ * Was seen in the wild. Not supported (yet?).
+ * See https://www.gnu.org/software/tar/manual/html_section/tar_92.html
+ * for the format. (An "Old GNU Format" was seen, not PAX formats).
+ */
+//      case 'D':       /* GNU dump dir */
+//      case 'M':       /* Continuation of multi volume archive */
+//      case 'N':       /* Old GNU for names > 100 characters */
+//      case 'V':       /* Volume header */
 #endif
-        case 'g':       /* pax global header */
-        case 'x': {     /* pax extended header */
-                if ((uoff_t)file_header->size > 0xfffff) /* paranoia */
-                        goto skip_ext_hdr;
-                process_pax_hdr(archive_handle, file_header->size, (tar.typeflag == 'g'));
-                goto again_after_align;
         }
  skip_ext_hdr:
         {
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 0a8c657b7..1c5c185d0 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -183,6 +183,13 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
                 USE_FOR_NOMMU(xstate->xformer_prog = "gunzip";)
                 goto found_magic;
         }
+        if (ENABLE_FEATURE_SEAMLESS_Z
+         && magic.b16[0] == COMPRESS_MAGIC
+        ) {
+                xstate->xformer = unpack_Z_stream;
+                USE_FOR_NOMMU(xstate->xformer_prog = "uncompress";)
+                goto found_magic;
+        }
         if (ENABLE_FEATURE_SEAMLESS_BZ2
          && magic.b16[0] == BZIP2_MAGIC
         ) {