From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: sf <sf-gmane@stephan-feder.de>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/3] sha1_file: add the ability to parse objects in "pack file format"
Date: Tue, 11 Jul 2006 17:46:31 -0700 [thread overview]
Message-ID: <7vveq31wgo.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0607111656250.5623@g5.osdl.org> (Linus Torvalds's message of "Tue, 11 Jul 2006 17:03:20 -0700 (PDT)")
Linus Torvalds <torvalds@osdl.org> writes:
> It's actually really part of the specs, and not just happenstance.
> Well, I normally would agree with you if it was a "oh, all our zlib
> objects seem to start with 0x78" thing, but after having dug into both the
> zlib standard (which is actually an RFC, not just some random thing), and
> looked at the sources, it's definitely the case that the "0x78" byte isn't
> just an implementation detail.
Ok, I do not think we would worry about casting use of deflate +
32k windowsize in stone that much, and being able to check the
size and type without inflating certainly is attractive.
Validating FCHECK bits is surely a nice touch. Thanks.
> Anyway, I think this following patch replaces the old 2/3 and 3/3 (it
> still depends on the original [1/3] cleanup.
>
> (It also renames and reverses the meaning of the config file option: it's
> now "[core] LegacyHeaders = true" for using legacy headers.)
>
> Not heavily tested, but seems ok.
I'd queue it in "pu" with reversed default and then move it to
"next" later.
> static void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size)
> {
> int bytes = strlen(buffer) + 1;
> unsigned char *buf = xmalloc(1+size);
> + unsigned long n;
>
> - memcpy(buf, (char *) buffer + bytes, stream->total_out - bytes);
> - bytes = stream->total_out - bytes;
> + n = stream->total_out - bytes;
> + if (n > size)
> + n = size;
> + memcpy(buf, (char *) buffer + bytes, n);
> + bytes = n;
> if (bytes < size) {
> stream->next_out = buf + bytes;
> stream->avail_out = size - bytes;
This one looks like an independent fix for a well spotted bug.
> int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *returnsha1)
> {
> int size;
> @@ -1459,7 +1550,7 @@ int write_sha1_file(void *buf, unsigned
> /* Set it up */
> memset(&stream, 0, sizeof(stream));
> deflateInit(&stream, zlib_compression_level);
> - size = deflateBound(&stream, len+hdrlen);
> + size = 8 + deflateBound(&stream, len+hdrlen);
> compressed = xmalloc(size);
>
> /* Compress it */
I am wondring what this eight is. You would pack 7 7-bit length
plus 4-bit totalling 49+4 = 53-bit length (plus 4-bit type). Is
it an unwritten decision that the format would not deal with
objects larger than 2^53 (which is probably fine but looks
magic)?
next prev parent reply other threads:[~2006-07-12 0:46 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-10 23:01 Revisiting large binary files issue Carl Baldwin
2006-07-10 23:14 ` Junio C Hamano
2006-07-11 6:20 ` Peter Baumann
2006-07-10 23:28 ` Linus Torvalds
2006-07-11 9:40 ` [RFC]: Pack-file object format for individual objects (Was: Revisiting large binary files issue.) sf
2006-07-11 18:00 ` Linus Torvalds
2006-07-11 21:45 ` sf
2006-07-11 22:17 ` Linus Torvalds
2006-07-11 22:26 ` Linus Torvalds
2006-07-11 14:55 ` Revisiting large binary files issue Carl Baldwin
2006-07-11 17:09 ` Linus Torvalds
2006-07-11 17:10 ` [PATCH 1/3] Make the unpacked object header functions static to sha1_file.c Linus Torvalds
2006-07-11 17:12 ` [PATCH 2/3] sha1_file: add the ability to parse objects in "pack file format" Linus Torvalds
2006-07-11 18:40 ` Johannes Schindelin
2006-07-11 18:58 ` Linus Torvalds
2006-07-11 19:20 ` Johannes Schindelin
2006-07-11 19:48 ` Linus Torvalds
2006-07-11 21:25 ` Johannes Schindelin
2006-07-11 21:47 ` Junio C Hamano
2006-07-11 21:24 ` sf
2006-07-11 22:09 ` Linus Torvalds
2006-07-11 22:25 ` sf
2006-07-11 23:03 ` Junio C Hamano
2006-07-12 0:03 ` Linus Torvalds
2006-07-12 0:39 ` Johannes Schindelin
2006-07-12 3:45 ` Linus Torvalds
2006-07-12 4:31 ` Linus Torvalds
2006-07-12 6:35 ` Junio C Hamano
2006-07-12 16:29 ` Linus Torvalds
2006-07-12 0:46 ` Junio C Hamano [this message]
2006-07-12 3:42 ` Linus Torvalds
2006-07-12 6:49 ` Peter Baumann
2006-07-12 7:16 ` Junio C Hamano
2006-07-12 8:28 ` Peter Baumann
2006-07-12 15:13 ` Linus Torvalds
2006-07-12 15:27 ` Junio C Hamano
2006-07-11 17:16 ` [PATCH 3/3] Enable the new binary header format for unpacked objects Linus Torvalds
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=7vveq31wgo.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sf-gmane@stephan-feder.de \
--cc=torvalds@osdl.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).