Merge branch 'busybox' into merge

2 files changed, 37 insertions, 29 deletions

diff --git a/archival/chksum_and_xwrite_tar_header.c b/archival/chksum_and_xwrite_tar_header.c
new file mode 100644
index 000000000..25934f898
--- /dev/null
+++ b/archival/chksum_and_xwrite_tar_header.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-$(CONFIG_FEATURE_TAR_CREATE) += chksum_and_xwrite_tar_header.o
+//kbuild:lib-$(CONFIG_SMEMCAP) += chksum_and_xwrite_tar_header.o
+
+#include "libbb.h"
+#include "bb_archive.h"
+
+void FAST_FUNC chksum_and_xwrite_tar_header(int fd, struct tar_header_t *hp)
+{
+        /* POSIX says that checksum is done on unsigned bytes
+         * (Sun and HP-UX gets it wrong... more details in
+         * GNU tar source) */
+        const unsigned char *cp;
+        int chksum, size;
+
+        strcpy(hp->magic, "ustar  ");
+
+        /* Calculate and store the checksum (the sum of all of the bytes of
+         * the header).  The checksum field must be filled with blanks for the
+         * calculation.  The checksum field is formatted differently from the
+         * other fields: it has 6 digits, a NUL, then a space -- rather than
+         * digits, followed by a NUL like the other fields... */
+        memset(hp->chksum, ' ', sizeof(hp->chksum));
+        cp = (const unsigned char *) hp;
+        chksum = 0;
+        size = sizeof(*hp);
+        do { chksum += *cp++; } while (--size);
+        sprintf(hp->chksum, "%06o", chksum);
+
+        xwrite(fd, hp, sizeof(*hp));
+}
diff --git a/archival/tar.c b/archival/tar.c
index 67c90e6fd..054640c01 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -256,32 +256,6 @@ static void putOctal(char *cp, int len, off_t value)
 }
 #define PUT_OCTAL(a, b) putOctal((a), sizeof(a), (b))
 
-static void chksum_and_xwrite(int fd, struct tar_header_t* hp)
-{
-        /* POSIX says that checksum is done on unsigned bytes
-         * (Sun and HP-UX gets it wrong... more details in
-         * GNU tar source) */
-        const unsigned char *cp;
-        int chksum, size;
-
-        strcpy(hp->magic, "ustar  ");
-
-        /* Calculate and store the checksum (i.e., the sum of all of the bytes of
-         * the header).  The checksum field must be filled with blanks for the
-         * calculation.  The checksum field is formatted differently from the
-         * other fields: it has 6 digits, a null, then a space -- rather than
-         * digits, followed by a null like the other fields... */
-        memset(hp->chksum, ' ', sizeof(hp->chksum));
-        cp = (const unsigned char *) hp;
-        chksum = 0;
-        size = sizeof(*hp);
-        do { chksum += *cp++; } while (--size);
-        putOctal(hp->chksum, sizeof(hp->chksum)-1, chksum);
-
-        /* Now write the header out to disk */
-        xwrite(fd, hp, sizeof(*hp));
-}
-
 # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
 static void writeLongname(int fd, int type, const char *name, int dir)
 {
@@ -312,7 +286,7 @@ static void writeLongname(int fd, int type, const char *name, int dir)
         /* + dir: account for possible '/' */
 
         PUT_OCTAL(header.size, size);
-        chksum_and_xwrite(fd, &header);
+        chksum_and_xwrite_tar_header(fd, &header);
 
         /* Write filename[/] and pad the block. */
         /* dir=0: writes 'name<NUL>', pads */
@@ -443,8 +417,7 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
                                 header_name, S_ISDIR(statbuf->st_mode));
 # endif
 
-        /* Now write the header out to disk */
-        chksum_and_xwrite(tbInfo->tarFd, &header);
+        chksum_and_xwrite_tar_header(tbInfo->tarFd, &header);
 
         /* Now do the verbose thing (or not) */
         if (tbInfo->verboseFlag) {