git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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
Previous: John Cai via GitGitGadgetNext: John Cai via GitGitGadget
Message 26 of 43 in “name-rev: deprecate --stdin in favor of --annotate-text”
  1. name-rev: deprecate --stdin in favor of --annotate-textJohn Cai via GitGitGadget, Dec 26, 2021
  2. Junio C HamanoDec 27, 2021
  3. John CaiDec 28, 2021
  4. Junio C HamanoDec 31, 2021
  5. Johannes SchindelinJan 1, 2022
  6. 0/2 name-rev: deprecate --stdin in favor of --anotate-textJohn Cai via GitGitGadget, Dec 29, 2021
  7. 1/2 name-rev: deprecate --stdin in favor of --annotate-textJohn Cai via GitGitGadget, Dec 29, 2021
  8. Junio C HamanoDec 30, 2021
  9. 2/2 name-rev.c: use strbuf_getline instead of limited size bufferJohn Cai via GitGitGadget, Dec 29, 2021
  10. 0/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 3, 2022
  11. 1/2 name-rev: deprecate --stdin in favor of --annotate-textJohn Cai via GitGitGadget, Jan 3, 2022
  12. Junio C HamanoJan 4, 2022
  13. Junio C HamanoJan 4, 2022
  14. Philip OakleyJan 4, 2022
  15. Junio C HamanoJan 4, 2022
  16. Eric SunshineJan 4, 2022
  17. 2/2 name-rev.c: use strbuf_getline instead of limited size bufferJohn Cai via GitGitGadget, Jan 3, 2022
  18. Junio C HamanoJan 4, 2022
  19. 0/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 4, 2022
  20. 1/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 4, 2022
  21. Junio C HamanoJan 4, 2022
  22. Phillip WoodJan 5, 2022
  23. Junio C HamanoJan 5, 2022
  24. Junio C HamanoJan 5, 2022
  25. 2/2 name-rev.c: use strbuf_getline instead of limited size bufferJohn Cai via GitGitGadget, Jan 4, 2022
  26. John CaiJan 4, 2022
  27. 0/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 5, 2022
  28. 2/2 name-rev.c: use strbuf_getline instead of limited size bufferJohn Cai via GitGitGadget, Jan 5, 2022
  29. 1/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 5, 2022
  30. Junio C HamanoJan 5, 2022
  31. 0/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 5, 2022
  32. 1/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 5, 2022
  33. 2/2 name-rev.c: use strbuf_getline instead of limited size bufferJohn Cai via GitGitGadget, Jan 5, 2022
  34. Junio C HamanoJan 5, 2022
  35. 0/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 5, 2022
  36. 1/2 name-rev: deprecate --stdin in favor of --annotate-stdinJohn Cai via GitGitGadget, Jan 5, 2022
  37. John CaiJan 8, 2022
  38. Junio C HamanoJan 10, 2022
  39. John CaiJan 10, 2022
  40. Junio C HamanoJan 10, 2022
  41. Phillip WoodJan 11, 2022
  42. 2/2 name-rev.c: use strbuf_getline instead of limited size bufferJohn Cai via GitGitGadget, Jan 5, 2022
  43. Ævar Arnfjörð BjarmasonJan 18, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.