From: Jeff Hostetler <git@jeffhostetler.com>
To: Jeff King <peff@peff.net>, Jeff Hostetler <jeffhost@microsoft.com>
Cc: git@vger.kernel.org, gitster@pobox.com, markbt@efaref.net,
benpeart@microsoft.com, jonathantanmy@google.com
Subject: Re: [PATCH 01/10] pack-objects: eat CR in addition to LF after fgets.
Date: Thu, 9 Mar 2017 10:46:53 -0500 [thread overview]
Message-ID: <52221b43-0c38-97a2-d96d-0dedf5f45796@jeffhostetler.com> (raw)
In-Reply-To: <20170309070128.we6hbraea5am3ado@sigill.intra.peff.net>
On 3/9/2017 2:01 AM, Jeff King wrote:
> On Wed, Mar 08, 2017 at 05:37:56PM +0000, Jeff Hostetler wrote:
>
>> From: Jeff Hostetler <git@jeffhostetler.com>
>>
>> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
>> ---
>> builtin/pack-objects.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
>> index f294dcf..7e052bb 100644
>> --- a/builtin/pack-objects.c
>> +++ b/builtin/pack-objects.c
>> @@ -2764,6 +2764,8 @@ static void get_object_list(int ac, const char **av)
>> int len = strlen(line);
>> if (len && line[len - 1] == '\n')
>> line[--len] = 0;
>> + if (len && line[len - 1] == '\r')
>> + line[--len] = 0;
>
> Rather than add features to this bespoke line-reader, can we switch this
> to use strbuf_getline()? That handles line endings, and avoids the
> awkward corner case where fgets "breaks" a long line across two calls.
>
> Something like the patch below. I suspect read_object_list_from_stdin()
> should get the same treatment.
Much nicer. Will do. Thanks!
>
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index 76b1919ca..6b9fffe9c 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -2765,7 +2765,7 @@ static void record_recent_commit(struct commit *commit, void *data)
> static void get_object_list(int ac, const char **av)
> {
> struct rev_info revs;
> - char line[1000];
> + struct strbuf buf = STRBUF_INIT;
> int flags = 0;
>
> init_revisions(&revs, NULL);
> @@ -2775,12 +2775,12 @@ static void get_object_list(int ac, const char **av)
> /* make sure shallows are read */
> is_repository_shallow();
>
> - while (fgets(line, sizeof(line), stdin) != NULL) {
> - int len = strlen(line);
> - if (len && line[len - 1] == '\n')
> - line[--len] = 0;
> - if (!len)
> + while (strbuf_getline(&buf, stdin) != EOF) {
> + const char *line = buf.buf;
> +
> + if (!buf.len)
> break;
> +
> if (*line == '-') {
> if (!strcmp(line, "--not")) {
> flags ^= UNINTERESTING;
> @@ -2800,6 +2800,7 @@ static void get_object_list(int ac, const char **av)
> if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
> die("bad revision '%s'", line);
> }
> + strbuf_release(&buf);
>
> if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
> return;
>
next prev parent reply other threads:[~2017-03-09 15:47 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-08 17:37 [PATCH 00/10] RFC Partial Clone and Fetch Jeff Hostetler
2017-03-08 17:37 ` [PATCH 01/10] pack-objects: eat CR in addition to LF after fgets Jeff Hostetler
2017-03-09 7:01 ` Jeff King
2017-03-09 15:46 ` Jeff Hostetler [this message]
2017-03-08 17:37 ` [PATCH 02/10] pack-objects: add --partial-by-size=n --partial-special Jeff Hostetler
2017-03-08 18:47 ` Junio C Hamano
2017-03-08 20:21 ` Jeff Hostetler
2017-03-09 7:04 ` Jeff King
2017-03-10 17:58 ` Brandon Williams
2017-03-10 18:03 ` Jeff King
2017-03-10 19:38 ` Junio C Hamano
2017-03-10 19:47 ` Jeff King
2017-03-09 7:31 ` Jeff King
2017-03-09 18:26 ` Jeff Hostetler
2017-03-08 17:37 ` [PATCH 03/10] pack-objects: test for --partial-by-size --partial-special Jeff Hostetler
2017-03-09 7:35 ` Jeff King
2017-03-09 18:11 ` Johannes Sixt
2017-03-08 17:37 ` [PATCH 04/10] upload-pack: add partial (sparse) fetch Jeff Hostetler
2017-03-09 7:48 ` Jeff King
2017-03-09 18:34 ` Jeff Hostetler
2017-03-09 19:09 ` Jeff King
2017-03-08 17:38 ` [PATCH 05/10] fetch-pack: add partial-by-size and partial-special Jeff Hostetler
2017-03-08 17:38 ` [PATCH 06/10] rev-list: add --allow-partial option to relax connectivity checks Jeff Hostetler
2017-03-08 18:55 ` Junio C Hamano
2017-03-08 20:10 ` Jeff Hostetler
2017-03-09 7:56 ` Jeff King
2017-03-09 18:38 ` Jeff Hostetler
2017-03-08 17:38 ` [PATCH 07/10] index-pack: add --allow-partial option to relax blob existence checks Jeff Hostetler
2017-03-08 17:38 ` [PATCH 08/10] fetch: add partial-by-size and partial-special arguments Jeff Hostetler
2017-03-08 17:38 ` [PATCH 09/10] clone: " Jeff Hostetler
2017-03-08 17:38 ` [PATCH 10/10] ls-partial: created command to list missing blobs Jeff Hostetler
2017-03-08 18:50 [PATCH 00/10] RFC Partial Clone and Fetch git
2017-03-08 18:50 ` [PATCH 01/10] pack-objects: eat CR in addition to LF after fgets git
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52221b43-0c38-97a2-d96d-0dedf5f45796@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=markbt@efaref.net \
--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.
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 NNTP newsgroup(s).