Re: [Outreachy PATCH v5 2/2] gpg-interface: do not use misdesigned strbuf_split*()

From: Christian Couder <christian.couder@gmail.com>
Date: Oct 22, 2025, 14:03 UTC
Message-ID: <CAP8UFD3OTMi6uxv+z4rTqJ4wVpmezSG2Yj8tZMpgptWaWU343w@mail.gmail.com>
In-Reply-To: <5df667227b8b8951bad6c3cba54230ea8f6d3830.1761135129.git.belkid98@gmail.com>

On Wed, Oct 22, 2025 at 2:40 PM Olamide Caleb Bello <belkid98@gmail.com> wrote:

[...]

Show 5 quoted lines

> Simplify the process of retrieving and returning the desired line by
> using strchr() to isolate the line and xmemdupz() to return a copy of the
> line.
> This removes the roundabout way of splitting the string into strbufs, just
> to return the line.

Nit: here also I think it should be clear that these last two
sentences are in the same paragraph.

[...]

Show 10 quoted lines

> @@ -887,19 +887,22 @@ static char *get_default_ssh_signing_key(void)
>                            &key_stderr, 0);
>
>         if (!ret) {
> -               keys = strbuf_split_max(&key_stdout, '\n', 2);
> -               if (keys[0] && is_literal_ssh_key(keys[0]->buf, &literal_key)) {
> +               begin = key_stdout.buf;
> +               new_line = strchr(begin, '\n');
> +               end = new_line ? new_line : strchr(begin, '\0');
> +               first_line = xmemdupz(begin, end - begin);

That works but I wonder if something like the following is not a bit better:

               if (new_line)
                       first_line = xmemdupz(begin, new_line - begin);
               else
                       first_line = xstrdup(begin);

Thanks.