From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] archive-tar: write extended headers for file sizes >= 8GB
Date: Tue, 21 Jun 2016 22:57:43 +0200 [thread overview]
Message-ID: <5769AA47.4020806@web.de> (raw)
In-Reply-To: <5769A6CC.9030001@web.de>
Am 21.06.2016 um 22:42 schrieb René Scharfe:
> The value 120 is magic; we need it to pass the tests. That's
> because prepare_header() is used for building extended header
> records as well and we don't create extended headers for extended
> headers (not sure if that would work anyway), so they simply
> vanish when they're over the limit as their size field is set to
> zero.
So how about something like this to make sure extended headers are
only written for regular files and not for other extended headers?
---
archive-tar.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/archive-tar.c b/archive-tar.c
index ed562d4..f53e61c 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -199,7 +199,7 @@ static void prepare_header(struct archiver_args *args,
{
xsnprintf(header->mode, sizeof(header->mode), "%07o", mode & 07777);
xsnprintf(header->size, sizeof(header->size), "%011lo",
- S_ISREG(mode) ? ustar_size(size) : 0);
+ S_ISREG(mode) ? size : 0);
xsnprintf(header->mtime, sizeof(header->mtime), "%011lo",
ustar_mtime(args->time));
@@ -240,7 +240,7 @@ static int write_tar_entry(struct archiver_args *args,
struct ustar_header header;
struct strbuf ext_header = STRBUF_INIT;
unsigned int old_mode = mode;
- unsigned long size;
+ unsigned long size, size_in_header;
void *buffer;
int err = 0;
@@ -299,12 +299,14 @@ static int write_tar_entry(struct archiver_args *args,
memcpy(header.linkname, buffer, size);
}
- if (S_ISREG(mode) && ustar_size(size) != size)
+ size_in_header = S_ISREG(mode) ? ustar_size(size) : size;
+ if (size_in_header != size)
strbuf_append_ext_header_uint(&ext_header, "size", size);
+
if (ustar_mtime(args->time) != args->time)
strbuf_append_ext_header_uint(&ext_header, "mtime", args->time);
- prepare_header(args, &header, mode, size);
+ prepare_header(args, &header, mode, size_in_header);
if (ext_header.len > 0) {
err = write_extended_header(args, sha1, ext_header.buf,
--
2.9.0
next prev parent reply other threads:[~2016-06-21 20:58 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 4:35 [PATCH 0/2] friendlier handling of overflows in archive-tar Jeff King
2016-06-16 4:37 ` [PATCH 1/2] archive-tar: write extended headers for file sizes >= 8GB Jeff King
2016-06-20 22:54 ` René Scharfe
2016-06-21 15:59 ` Jeff King
2016-06-21 16:02 ` Jeff King
2016-06-21 20:42 ` René Scharfe
2016-06-21 20:57 ` René Scharfe [this message]
2016-06-21 21:04 ` Jeff King
2016-06-22 5:46 ` René Scharfe
2016-06-21 21:02 ` Jeff King
2016-06-22 5:46 ` René Scharfe
2016-06-23 19:21 ` Jeff King
2016-06-21 20:54 ` René Scharfe
2016-06-21 19:44 ` Robin H. Johnson
2016-06-21 20:57 ` Jeff King
2016-06-16 4:37 ` [PATCH 2/2] archive-tar: write extended headers for far-future mtime Jeff King
2016-06-20 22:54 ` René Scharfe
2016-06-22 5:46 ` René Scharfe
2016-06-23 19:22 ` Jeff King
2016-06-23 21:38 ` René Scharfe
2016-06-23 21:39 ` Jeff King
2016-06-16 17:55 ` [PATCH 0/2] friendlier handling of overflows in archive-tar Junio C Hamano
2016-06-21 16:16 ` Jeff King
2016-06-21 16:16 ` [PATCH v2 1/2] archive-tar: write extended headers for file sizes >= 8GB Jeff King
2016-06-21 16:17 ` [PATCH v2 2/2] archive-tar: write extended headers for far-future mtime Jeff King
2016-06-21 18:43 ` [PATCH 0/2] friendlier handling of overflows in archive-tar Junio C Hamano
2016-06-23 23:15 ` [PATCH v3] " Jeff King
2016-06-23 23:20 ` [PATCH v3 1/4] t5000: test tar files that overflow ustar headers Jeff King
2016-06-23 23:31 ` Jeff King
2016-06-24 16:38 ` Johannes Sixt
2016-06-24 16:46 ` Jeff King
2016-06-24 17:05 ` Johannes Sixt
2016-06-24 19:39 ` [PATCH 0/4] portable signal-checking in tests Jeff King
2016-06-24 19:43 ` [PATCH 1/4] tests: factor portable signal check out of t0005 Jeff King
2016-06-24 20:52 ` Johannes Sixt
2016-06-24 21:05 ` Jeff King
2016-06-24 21:32 ` Johannes Sixt
2016-06-24 19:44 ` [PATCH 2/4] t0005: use test_match_signal as appropriate Jeff King
2016-06-24 19:45 ` [PATCH 3/4] test_must_fail: use test_match_signal Jeff King
2016-06-24 19:45 ` [PATCH 4/4] t/lib-git-daemon: " Jeff King
2016-06-24 19:48 ` [PATCH 0/4] portable signal-checking in tests Jeff King
2016-06-24 18:56 ` [PATCH v3 1/4] t5000: test tar files that overflow ustar headers Junio C Hamano
2016-06-24 19:07 ` Jeff King
2016-06-24 19:44 ` Junio C Hamano
2016-06-24 20:58 ` Eric Sunshine
2016-06-24 21:09 ` Jeff King
2016-06-24 20:58 ` Jeff King
2016-06-24 22:41 ` Junio C Hamano
2016-06-24 23:22 ` Jeff King
2016-06-23 23:21 ` [PATCH v3 2/4] archive-tar: write extended headers for file sizes >= 8GB Jeff King
2016-06-24 19:01 ` Junio C Hamano
2016-06-24 19:10 ` Jeff King
2016-06-24 19:45 ` Junio C Hamano
2016-06-24 19:46 ` Jeff King
2016-06-23 23:21 ` [PATCH v3 3/4] archive-tar: write extended headers for far-future mtime Jeff King
2016-06-24 19:06 ` Junio C Hamano
2016-06-24 19:16 ` Jeff King
2016-06-23 23:21 ` [PATCH v3 4/4] archive-tar: drop return value Jeff King
2016-06-24 11:49 ` Remi Galan Alfonso
2016-06-24 13:13 ` Jeff King
2016-06-24 19:10 ` Junio C Hamano
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=5769AA47.4020806@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).