From: Fabian Stelzer <fs@gigacodes.de>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git List <git@vger.kernel.org>,
Pedro Martelletto <pedro@yubico.com>, Jeff King <peff@peff.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2] gpg-interface: trim CR from ssh-keygen
Date: Mon, 10 Jan 2022 13:28:59 +0100 [thread overview]
Message-ID: <20220110122859.3x37a7xdbmcsmuvm@fs> (raw)
In-Reply-To: <CAPig+cQMP_Ppg6uywAcFhaVqSoa71dD6UjXbUtC-bvK0WzJnZA@mail.gmail.com>
On 09.01.2022 15:49, Eric Sunshine wrote:
>On Wed, Jan 5, 2022 at 5:36 AM Fabian Stelzer <fs@gigacodes.de> wrote:
>> On 05.01.2022 02:09, Eric Sunshine wrote:
>> >> > line = strchrnul(line + 1, '\n')) {
>> >> > while (*line == '\n')
>> >> > line++;
>> >> > if (!*line)
>> >> > break;
>> >
>> >Indeed, the existing code is confusing me. I've been staring at it for
>> >several minutes and I think I'm still failing to understand the
>> >purpose of the +1 in the strchrnul() call. Perhaps I'm missing
>> >something obvious(?).
>>
>> This whole loop was basically copied from parse_gpg_output() above. Without
>> the +1 this would always find the same line in the buffer. The +1 skips over
>> the previously found LF.
>
>I still don't see the point of +1 in the strchrnul() call. After:
>
> line = strchrnul(line + 1, '\n'))
>
>`line` is going to point either at '\n' or at NUL. Then:
>
> while (*line == '\n')
> line++;
>
>skips over the '\n' if present. So, by the time the next loop
>iteration starts, `line` will already be pointing past the '\n' we
>just found, thus the +1 seems pointless (and maybe even buggy).
>
>But perhaps I have a blind spot and am missing something obvious...
Hm, yeah. I think you are correct. The while below should make the +1
unnecessary. I think this never mattered to parse_gpg_output() since it is
only looking for the [GNUPG:] status line which probably comes first anyway.
If it does not then I think the loop will skip over it. Same thing with ssh
(but we are changing this whole loop anyway)
next prev parent reply other threads:[~2022-01-10 12:29 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-03 13:31 [PATCH] gpg-interface: trim CR from ssh-keygen -Y find-principals Johannes Schindelin via GitGitGadget
2021-12-03 14:18 ` Fabian Stelzer
2021-12-03 15:58 ` Jeff King
2021-12-04 13:11 ` Fabian Stelzer
2021-12-05 5:50 ` Junio C Hamano
[not found] ` <CABPYr=y+sDDko9zPxQTOM6Tz4E7CafH7hJc6oB1zv7XYA9KH1A@mail.gmail.com>
2021-12-09 16:33 ` Fabian Stelzer
[not found] ` <CABPYr=xfotWvTQK9k1eKHa0kP4SsB=TKKuM0d8cpMb5BtuUZLA@mail.gmail.com>
2021-12-09 17:20 ` Fabian Stelzer
2021-12-30 10:25 ` Fabian Stelzer
2021-12-05 23:06 ` Damien Miller
2021-12-06 8:39 ` Fabian Stelzer
2022-01-03 9:53 ` [PATCH v2] gpg-interface: trim CR from ssh-keygen Fabian Stelzer
2022-01-03 17:17 ` Eric Sunshine
2022-01-03 23:34 ` Junio C Hamano
2022-01-04 0:41 ` Eric Sunshine
2022-01-04 1:19 ` Junio C Hamano
2022-01-04 3:06 ` Eric Sunshine
2022-01-04 12:55 ` Fabian Stelzer
2022-01-04 19:33 ` Junio C Hamano
2022-01-05 7:09 ` Eric Sunshine
2022-01-05 10:36 ` Fabian Stelzer
2022-01-05 20:40 ` Junio C Hamano
2022-01-06 10:26 ` Fabian Stelzer
2022-01-06 17:50 ` Junio C Hamano
2022-01-09 20:49 ` Eric Sunshine
2022-01-10 12:28 ` Fabian Stelzer [this message]
2022-01-07 9:07 ` [PATCH v3] " Fabian Stelzer
2022-01-09 21:37 ` Eric Sunshine
2022-01-10 12:59 ` Fabian Stelzer
2022-01-10 17:51 ` Junio C Hamano
2022-01-10 17:03 ` 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=20220110122859.3x37a7xdbmcsmuvm@fs \
--to=fs@gigacodes.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=pedro@yubico.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/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).