| Message ID | e4bd09ccf75d48e7c6e8c4901395449bf79aa3c3.1641221261.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | name-rev: deprecate --stdin in favor of --annotate-stdin | expand |
"John Cai via GitGitGadget" <gitgitgadget@gmail.com> writes: > 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 | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/builtin/name-rev.c b/builtin/name-rev.c > index 21370afdaf9..85993bc2b38 100644 > --- a/builtin/name-rev.c > +++ b/builtin/name-rev.c > @@ -625,12 +625,10 @@ 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_getwholeline(&sb, stdin, '\n') != EOF) { As we are reading text, I wonder if it makes more sense to just use strbuf_getline() that is meant to use the definition of "line" that honors the platform convention (i.e. on Windows, '\r\n' is taken as the EOL marker). > + name_rev_line(sb.buf, &data); > } > + strbuf_release(&sb); > } else if (all) { > int i, max; Other than that, looking good. Thanks.
diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 21370afdaf9..85993bc2b38 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -625,12 +625,10 @@ 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_getwholeline(&sb, stdin, '\n') != EOF) { + name_rev_line(sb.buf, &data); } + strbuf_release(&sb); } else if (all) { int i, max;