summaryrefslogtreecommitdiff
path: root/test-line-buffer.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-01-02 18:50:16 -0600
committerJonathan Nieder <jrnieder@gmail.com>2011-02-26 04:57:59 -0600
commit850c5ea44ce0b4aac3be7c4d14b38ec901e777d1 (patch)
tree1cf9b395768c7d375b5e1f9d0938c70222a31cfc /test-line-buffer.c
parente5e45ca1e35482d120a7ce776cf208369edcc459 (diff)
downloadgit-850c5ea44ce0b4aac3be7c4d14b38ec901e777d1.tar.gz
vcs-svn: make test-line-buffer input format more flexible
Imitate the input format of test-obj-pool to support arbitrary sequences of commands rather than alternating read/copy. This should make it easier to add tests that exercise other line_buffer functions. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'test-line-buffer.c')
-rw-r--r--test-line-buffer.c56
1 files changed, 36 insertions, 20 deletions
diff --git a/test-line-buffer.c b/test-line-buffer.c
index f9af892d28..383f35bba6 100644
--- a/test-line-buffer.c
+++ b/test-line-buffer.c
@@ -1,11 +1,5 @@
/*
* 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"
@@ -20,28 +14,50 @@ static uint32_t strtouint32(const char *s)
return (uint32_t) n;
}
+static void handle_command(const char *command, const char *arg, struct line_buffer *buf)
+{
+ switch (*command) {
+ case 'c':
+ if (!prefixcmp(command, "copy ")) {
+ buffer_copy_bytes(buf, strtouint32(arg) + 1);
+ return;
+ }
+ case 'r':
+ if (!prefixcmp(command, "read ")) {
+ const char *s = buffer_read_string(buf, strtouint32(arg));
+ printf("%s\n", s);
+ buffer_skip_bytes(buf, 1); /* consume newline */
+ 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 buf = LINE_BUFFER_INIT;
+ struct line_buffer stdin_buf = LINE_BUFFER_INIT;
char *s;
if (argc != 1)
- usage("test-line-buffer < input.txt");
- if (buffer_init(&buf, NULL))
+ usage("test-line-buffer < script");
+
+ if (buffer_init(&stdin_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))
+ while ((s = buffer_read_line(&stdin_buf)))
+ handle_line(s, &stdin_buf);
+ if (buffer_deinit(&stdin_buf))
die("input error");
if (ferror(stdout))
die("output error");
- buffer_reset(&buf);
+ buffer_reset(&stdin_buf);
return 0;
}