mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![Jonathan Nieder](/assets/img/avatar_default.png)
buffer_read_string works well for non line-oriented input except for one problem: it does not tell the caller how many bytes were actually written. This means that unless one is very careful about checking for errors (and eof) the calling program cannot tell the difference between the string "foo" followed by an early end of file and the string "foo\0bar\0baz". So introduce a variant that reports the length, too, a thinner wrapper around strbuf_fread. Its result is written to a strbuf so the caller does not need to keep track of the number of bytes read. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
94 lines
2.1 KiB
C
94 lines
2.1 KiB
C
/*
|
|
* test-line-buffer.c: code to exercise the svn importer's input helper
|
|
*/
|
|
|
|
#include "git-compat-util.h"
|
|
#include "strbuf.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;
|
|
}
|
|
|
|
static void handle_command(const char *command, const char *arg, struct line_buffer *buf)
|
|
{
|
|
switch (*command) {
|
|
case 'b':
|
|
if (!prefixcmp(command, "binary ")) {
|
|
struct strbuf sb = STRBUF_INIT;
|
|
strbuf_addch(&sb, '>');
|
|
buffer_read_binary(buf, &sb, strtouint32(arg));
|
|
fwrite(sb.buf, 1, sb.len, stdout);
|
|
strbuf_release(&sb);
|
|
return;
|
|
}
|
|
case 'c':
|
|
if (!prefixcmp(command, "copy ")) {
|
|
buffer_copy_bytes(buf, strtouint32(arg));
|
|
return;
|
|
}
|
|
case 'r':
|
|
if (!prefixcmp(command, "read ")) {
|
|
const char *s = buffer_read_string(buf, strtouint32(arg));
|
|
fputs(s, stdout);
|
|
return;
|
|
}
|
|
case 's':
|
|
if (!prefixcmp(command, "skip ")) {
|
|
buffer_skip_bytes(buf, strtouint32(arg));
|
|
return;
|
|
}
|
|
default:
|
|
die("unrecognized command: %s", command);
|
|
}
|
|
}
|
|
|
|
static void handle_line(const char *line, struct line_buffer *stdin_buf)
|
|
{
|
|
const char *arg = strchr(line, ' ');
|
|
if (!arg)
|
|
die("no argument in line: %s", line);
|
|
handle_command(line, arg + 1, stdin_buf);
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
struct line_buffer stdin_buf = LINE_BUFFER_INIT;
|
|
struct line_buffer file_buf = LINE_BUFFER_INIT;
|
|
struct line_buffer *input = &stdin_buf;
|
|
const char *filename;
|
|
char *s;
|
|
|
|
if (argc == 1)
|
|
filename = NULL;
|
|
else if (argc == 2)
|
|
filename = argv[1];
|
|
else
|
|
usage("test-line-buffer [file] < script");
|
|
|
|
if (buffer_init(&stdin_buf, NULL))
|
|
die_errno("open error");
|
|
if (filename) {
|
|
if (buffer_init(&file_buf, filename))
|
|
die_errno("error opening %s", filename);
|
|
input = &file_buf;
|
|
}
|
|
|
|
while ((s = buffer_read_line(&stdin_buf)))
|
|
handle_line(s, input);
|
|
|
|
if (filename && buffer_deinit(&file_buf))
|
|
die("error reading from %s", filename);
|
|
if (buffer_deinit(&stdin_buf))
|
|
die("input error");
|
|
if (ferror(stdout))
|
|
die("output error");
|
|
buffer_reset(&stdin_buf);
|
|
return 0;
|
|
}
|