From: "René Scharfe" <l.s.r@web.de>
To: Peter Krefting <peter@softwolves.pp.se>
Cc: Johannes Sixt <j6t@kdbg.org>,
git@vger.kernel.org, Keith Goldfarb <keith@blackthorn-media.com>
Subject: Re: [PATCH v3 4/5] archive-zip: support archives bigger than 4GB
Date: Mon, 24 Apr 2017 22:06:11 +0200 [thread overview]
Message-ID: <d453610f-dbd5-3f6c-d386-69a74c238b11@web.de> (raw)
In-Reply-To: <alpine.DEB.2.11.1704241912510.30460@perkele.intern.softwolves.pp.se>
Am 24.04.2017 um 20:24 schrieb Peter Krefting:
> René Scharfe:
>
>> @@ -433,6 +446,11 @@ static int write_zip_entry(struct archiver_args
>> *args,
>> free(deflated);
>> free(buffer);
>>
>> + if (offset > 0xffffffff) {
>> + zip64_dir_extra_payload_size += 8;
>> + zip_dir_extra_size += 2 + 2 + zip64_dir_extra_payload_size;
>> + }
>> +
>> strbuf_add_le(&zip_dir, 4, 0x02014b50); /* magic */
>> strbuf_add_le(&zip_dir, 2, creator_version);
>> strbuf_add_le(&zip_dir, 2, 10); /* version */
>
> This needs to be >=. The spec says that if the value is 0xffffffff,
> there should be a zip64 record with the actual size (even if it is
> 0xffffffff).
Could you please cite the relevant part?
Here's how I read it: If a value doesn't fit into a 32-bit field it is
set to 0xffffffff, a zip64 extra is added and a 64-bit field stores the
actual value. The magic value 0xffffffff indicates that a corresponding
64-bit field is present in the zip64 extra. That means even if a value
is 0xffffffff (and thus fits) we need to add it to the zip64 extra. If
there is no zip64 extra then we can store 0xffffffff in the 32-bit
field, though.
> Also set the version required to 45 (4.5) for any record that has zip64
> fields.
Ah, yes indeed.
René
next prev parent reply other threads:[~2017-04-24 20:06 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 21:08 Git archive doesn't fully support zip64 Keith Goldfarb
2017-04-22 19:22 ` [PATCH] archive-zip: Add zip64 headers when file size is too large for 32 bits Peter Krefting
2017-04-22 21:52 ` Johannes Sixt
2017-04-22 22:41 ` [PATCH v2] " Peter Krefting
2017-04-23 7:50 ` Johannes Sixt
2017-04-23 14:51 ` Peter Krefting
2017-04-23 19:49 ` Johannes Sixt
2017-04-24 8:04 ` Peter Krefting
2017-04-24 12:04 ` René Scharfe
2017-04-24 17:22 ` [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB René Scharfe
2017-04-24 17:29 ` [PATCH v3 1/5] archive-zip: add tests for big ZIP archives René Scharfe
2017-04-24 17:30 ` [PATCH v3 2/5] archive-zip: use strbuf for ZIP directory René Scharfe
2017-04-25 4:51 ` Junio C Hamano
2017-04-25 5:28 ` René Scharfe
2017-04-24 17:31 ` [PATCH v3 3/5] archive-zip: write ZIP dir entry directly to strbuf René Scharfe
2017-04-24 17:32 ` [PATCH v3 4/5] archive-zip: support archives bigger than 4GB René Scharfe
2017-04-24 18:24 ` Peter Krefting
2017-04-24 20:06 ` René Scharfe [this message]
2017-04-24 20:39 ` René Scharfe
2017-04-24 21:02 ` Johannes Sixt
2017-04-24 21:41 ` René Scharfe
2017-04-25 7:55 ` Peter Krefting
2017-04-25 16:24 ` René Scharfe
2017-04-26 21:02 ` Peter Krefting
2017-04-26 23:38 ` René Scharfe
2017-04-27 4:57 ` Peter Krefting
2017-04-27 19:54 ` René Scharfe
2017-04-28 8:40 ` Peter Krefting
2017-04-24 17:33 ` [PATCH v3 5/5] archive-zip: support files " René Scharfe
2017-04-24 21:11 ` Keith Goldfarb
2017-04-25 4:46 ` Junio C Hamano
2017-04-25 5:27 ` René Scharfe
2017-04-29 21:00 ` [PATCH v3 0/5] archive-zip: support files and archives " Torsten Bögershausen
2017-04-29 22:28 ` René Scharfe
2017-04-30 5:31 ` Torsten Bögershausen
2017-04-30 7:53 ` René Scharfe
2017-04-30 13:06 ` Torsten Bögershausen
2017-04-30 16:32 ` Johannes Sixt
2017-04-30 16:40 ` René Scharfe
2017-04-30 23:49 ` Junio C Hamano
2017-05-01 8:30 ` René Scharfe
2017-04-23 0:16 ` [PATCH] archive-zip: Add zip64 headers when file size is too large for 32 bits René Scharfe
2017-04-23 6:42 ` Peter Krefting
2017-04-23 7:27 ` Johannes Sixt
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=d453610f-dbd5-3f6c-d386-69a74c238b11@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=keith@blackthorn-media.com \
--cc=peter@softwolves.pp.se \
/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).