Merge branch 'busybox' into merge

2 files changed, 8 insertions, 6 deletions

diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index b3131ff2d..2ab3c04b8 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -352,7 +352,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         /* case 0: */
         case '0':
 #if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
-                if (last_char_is(file_header->name, '/')) {
+                if (file_header->name && last_char_is(file_header->name, '/')) {
                         goto set_dir;
                 }
 #endif
diff --git a/archival/tar.c b/archival/tar.c
index c7642a50e..1796d4c60 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -299,7 +299,8 @@ static void writeLongname(int fd, int type, const char *name, int dir)
         header.typeflag = type;
         strcpy(header.name, "././@LongLink");
         /* This sets mode/uid/gid/mtime to "00...00<NUL>" strings */
-        memset(header.mode, '0', sizeof(struct prefilled));
+        memset((char*)&header + offsetof(struct tar_header_t, mode), /* make gcc-9.x happy */
+                        '0', sizeof(struct prefilled));
         header.mode [sizeof(header.mode ) - 1] = '\0';
         header.uid  [sizeof(header.uid  ) - 1] = '\0';
         header.gid  [sizeof(header.gid  ) - 1] = '\0';
@@ -492,10 +493,11 @@ static int exclude_file(const llist_t *excluded_files, const char *file)
 #  define exclude_file(excluded_files, file) 0
 # endif
 
-static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statbuf,
-                        void *userData, int depth UNUSED_PARAM)
+static int FAST_FUNC writeFileToTarball(struct recursive_state *state,
+                const char *fileName,
+                struct stat *statbuf)
 {
-        struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData;
+        struct TarBallInfo *tbInfo = (struct TarBallInfo *) state->userData;
         const char *header_name;
         int inputFileFd = -1;
 
@@ -714,7 +716,7 @@ static NOINLINE int writeTarFile(
         /* Read the directory/files and iterate over them one at a time */
         while (filelist) {
                 if (!recursive_action(filelist->data, recurseFlags,
-                                writeFileToTarball, writeFileToTarball, tbInfo, 0)
+                                writeFileToTarball, writeFileToTarball, tbInfo)
                 ) {
                         errorFlag = TRUE;
                 }