From: Matt Turner <mattst88@gmail.com>
To: git@vger.kernel.org
Cc: David Oberhollenzer <david.oberhollenzer@sigma-star.at>,
Matt Turner <mattst88@gmail.com>
Subject: [PATCH] archive: Store checksum correctly
Date: Mon, 22 Jul 2019 19:57:36 -0700 [thread overview]
Message-ID: <20190723025736.23036-1-mattst88@gmail.com> (raw)
tar2sqfs (part of https://github.com/topics/tar2sqfs) rejects tarballs
made with git archive with the message
invalid tar header checksum!
tar2sqfs recomputes the tarball's checksum to verify it. Its checksum
implementation agrees with GNU tar, which contains a comment that states
Fill in the checksum field. It's formatted differently from the
other fields: it has [6] digits, a null, then a space ...
Correcting this allows tar2sqfs to correctly process the tarballs made
by git archive.
Signed-off-by: Matt Turner <mattst88@gmail.com>
---
archive-tar.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/archive-tar.c b/archive-tar.c
index 3e53aac1e6..f9a157bfd1 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -215,7 +215,9 @@ static void prepare_header(struct archiver_args *args,
memcpy(header->magic, "ustar", 6);
memcpy(header->version, "00", 2);
- xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
+ xsnprintf(header->chksum, sizeof(header->chksum), "%06o", ustar_header_chksum(header));
+ header->chksum[6] = '\0';
+ header->chksum[7] = ' ';
}
static void write_extended_header(struct archiver_args *args,
--
2.22.0.dirty
next reply other threads:[~2019-07-23 2:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 2:57 Matt Turner [this message]
2019-07-23 16:49 ` [PATCH] archive: Store checksum correctly Junio C Hamano
2019-07-23 19:31 ` Jeff King
2019-07-23 19:38 ` René Scharfe
2019-07-23 20:08 ` René Scharfe
2019-07-23 21:34 ` David Oberhollenzer
2019-07-23 21:21 ` Junio C Hamano
2019-07-24 1:04 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190723025736.23036-1-mattst88@gmail.com \
--to=mattst88@gmail.com \
--cc=david.oberhollenzer@sigma-star.at \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).