strbuf: provide function to append whole lines

While the strbuf interface already provides functions to read a line
into it that completely replaces its current contents, we do not have an
interface that allows for appending lines without discarding current
contents.

Add a new function `strbuf_appendwholeline` that reads a line including
its terminating character into a strbuf non-destructively. This is a
preparatory step for git-update-ref(1) reading standard input line-wise
instead of as a block.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2020-03-30 15:46:27 +02:00 коммит произвёл Junio C Hamano
Родитель faa35eec4d
Коммит bd021f3910
2 изменённых файлов: 16 добавлений и 0 удалений

Просмотреть файл

@ -690,6 +690,16 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term)
} }
#endif #endif
int strbuf_appendwholeline(struct strbuf *sb, FILE *fp, int term)
{
struct strbuf line = STRBUF_INIT;
if (strbuf_getwholeline(&line, fp, term))
return EOF;
strbuf_addbuf(sb, &line);
strbuf_release(&line);
return 0;
}
static int strbuf_getdelim(struct strbuf *sb, FILE *fp, int term) static int strbuf_getdelim(struct strbuf *sb, FILE *fp, int term)
{ {
if (strbuf_getwholeline(sb, fp, term)) if (strbuf_getwholeline(sb, fp, term))

Просмотреть файл

@ -502,6 +502,12 @@ int strbuf_getline(struct strbuf *sb, FILE *file);
*/ */
int strbuf_getwholeline(struct strbuf *sb, FILE *file, int term); int strbuf_getwholeline(struct strbuf *sb, FILE *file, int term);
/**
* Like `strbuf_getwholeline`, but appends the line instead of
* resetting the buffer first.
*/
int strbuf_appendwholeline(struct strbuf *sb, FILE *file, int term);
/** /**
* Like `strbuf_getwholeline`, but operates on a file descriptor. * Like `strbuf_getwholeline`, but operates on a file descriptor.
* It reads one character at a time, so it is very slow. Do not * It reads one character at a time, so it is very slow. Do not