e5e45ca1e3
Collect the line_buffer state in a newly public line_buffer struct. Callers can use multiple line_buffers to manage input from multiple files at a time. svn-fe's delta applier will use this to stream a delta from svnrdump and the preimage it applies to from fast-import at the same time. The tests don't take advantage of the new features, but I think that's okay. It is easier to find lingering examples of nonreentrant code by searching for "static" in line_buffer.c. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
48 lines
990 B
C
48 lines
990 B
C
/*
|
|
* test-line-buffer.c: code to exercise the svn importer's input helper
|
|
*
|
|
* Input format:
|
|
* number NL
|
|
* (number bytes) NL
|
|
* number NL
|
|
* ...
|
|
*/
|
|
|
|
#include "git-compat-util.h"
|
|
#include "vcs-svn/line_buffer.h"
|
|
|
|
static uint32_t strtouint32(const char *s)
|
|
{
|
|
char *end;
|
|
uintmax_t n = strtoumax(s, &end, 10);
|
|
if (*s == '\0' || *end != '\0')
|
|
die("invalid count: %s", s);
|
|
return (uint32_t) n;
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
struct line_buffer buf = LINE_BUFFER_INIT;
|
|
char *s;
|
|
|
|
if (argc != 1)
|
|
usage("test-line-buffer < input.txt");
|
|
if (buffer_init(&buf, NULL))
|
|
die_errno("open error");
|
|
while ((s = buffer_read_line(&buf))) {
|
|
s = buffer_read_string(&buf, strtouint32(s));
|
|
fputs(s, stdout);
|
|
fputc('\n', stdout);
|
|
buffer_skip_bytes(&buf, 1);
|
|
if (!(s = buffer_read_line(&buf)))
|
|
break;
|
|
buffer_copy_bytes(&buf, strtouint32(s) + 1);
|
|
}
|
|
if (buffer_deinit(&buf))
|
|
die("input error");
|
|
if (ferror(stdout))
|
|
die("output error");
|
|
buffer_reset(&buf);
|
|
return 0;
|
|
}
|