Re: [PATCH v4 2/2] name-rev.c: use strbuf_getline instead of limited size buffer
- From
John Cai <johncai86@gmail.com>
- Date
- Jan 4, 2022, 14:54 UTC
- Message-ID
- <795F5A80-96B5-4963-8F0C-709A49DBF152@gmail.com>
- In-Reply-To
- <18f77ab9dde121ca16cc52c624322bda10e2d2bd.1641307776.git.gitgitgadget@gmail.com>
Show 27 quoted lines
> On Jan 4, 2022, at 9:49 AM, John Cai via GitGitGadget <gitgitgadget@gmail.com> wrote:
>
> From: John Cai <johncai86@gmail.com>
>
> Using a buffer limited to 2048 is unnecessarily limiting. Switch to
> using a string buffer to read in stdin for annotation.
>
> Signed-off-by: "John Cai" <johncai86@gmail.com>
> ---
> builtin/name-rev.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/name-rev.c b/builtin/name-rev.c
> index 21370afdaf9..d16b4ca0b66 100644
> --- a/builtin/name-rev.c
> +++ b/builtin/name-rev.c
> @@ -625,12 +625,11 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
> if (annotate_stdin) {
> struct strbuf sb = STRBUF_INIT;
>
> - while (!feof(stdin)) {
> - char *p = fgets(buffer, sizeof(buffer), stdin);
> - if (!p)
> - break;
> - name_rev_line(p, &data);
> + while (strbuf_getline(&sb, stdin) != EOF) {
> + strbuf_addch(&sb, '\n');I agree strbuf_getline is better since it handles EOF across platforms. However, one trouble I ran into is that it does not retain the line terminator, so I had to add it back in this fashion. It looks a little ugly, but let me know if you think this is preferable to using strbuf_getwholeline.
Show 8 quoted lines
> + name_rev_line(sb.buf, &data);
> }
> + strbuf_release(&sb);
> } else if (all) {
> int i, max;
>
> --
> gitgitgadget