Re: [PATCH v4 2/2] name-rev.c: use strbuf_getline instead of limited size buffer

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




> On Jan 4, 2022, at 9:49 AM, John Cai via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote:
> 
> From: John Cai <johncai86@xxxxxxxxx>
> 
> 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@xxxxxxxxx>
> ---
> 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.

> +			name_rev_line(sb.buf, &data);
> 		}
> +		strbuf_release(&sb);
> 	} else if (all) {
> 		int i, max;
> 
> -- 
> gitgitgadget





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux