From 4b9ea95d3bc0aad7e467961ffef81132ed927242 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Sat, 14 May 2011 20:13:55 +0200
Subject: [PATCH] test: buf size option for files too

---
 test/test.c     | 14 +++++++++-----
 test/test.h     |  2 +-
 test/testPsyc.c |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/test.c b/test/test.c
index def047d..fd3b951 100644
--- a/test/test.c
+++ b/test/test.c
@@ -34,7 +34,10 @@ void *get_in_addr (struct sockaddr *sa) {
 	return &(((struct sockaddr_in6*)sa)->sin6_addr);
 }
 
-void test_file(const char* filename) {
+void test_file(const char* filename, size_t recv_buf_size) {
+	if (recv_buf_size <= 0)
+		recv_buf_size = RECV_BUF_SIZE;
+
 	char buf[CONT_BUF_SIZE + RECV_BUF_SIZE];  // cont buf + recv buf: [  ccrrrr]
 	char *recvbuf = buf + CONT_BUF_SIZE;      // recv buf:                 ^^^^
 	size_t nbytes;
@@ -46,11 +49,15 @@ void test_file(const char* filename) {
 	}
 
 	test_init(0);
-	while ((nbytes = read(fd, (void*)recvbuf, RECV_BUF_SIZE)))
+
+	while ((nbytes = read(fd, (void*)recvbuf, recv_buf_size)))
 		test_input(0, recvbuf, nbytes);
 }
 
 void test_server(const char* port, size_t recv_buf_size) {
+	if (recv_buf_size <= 0)
+		recv_buf_size = RECV_BUF_SIZE;
+
 	char buf[CONT_BUF_SIZE + RECV_BUF_SIZE];  // cont buf + recv buf: [  ccrrrr]
 	char *recvbuf = buf + CONT_BUF_SIZE;      // recv buf:                 ^^^^
 
@@ -72,9 +79,6 @@ void test_server(const char* port, size_t recv_buf_size) {
 	struct addrinfo hints, *ai, *p;
 	struct timeval start[NUM_PARSERS], end[NUM_PARSERS];
 
-	if (recv_buf_size <= 0)
-		recv_buf_size = RECV_BUF_SIZE;
-
 	FD_ZERO(&master);    // clear the master and temp sets
 	FD_ZERO(&read_fds);
 
diff --git a/test/test.h b/test/test.h
index 0aede53..bd9fd36 100644
--- a/test/test.h
+++ b/test/test.h
@@ -9,7 +9,7 @@
 void test_init(int i);
 int test_input(int i, char *recvbuf, size_t nbytes);
 
-void test_file(const char* filename);
+void test_file(const char* filename, size_t recv_buf_size);
 void test_server(const char* port, size_t recv_buf_size);
 
 #endif
diff --git a/test/testPsyc.c b/test/testPsyc.c
index bc597d4..0f102a6 100644
--- a/test/testPsyc.c
+++ b/test/testPsyc.c
@@ -43,7 +43,7 @@ int main (int argc, char **argv) {
 	size_t recv_buf_size   = argc > 3 ? atoi(argv[3]) : 0;
 
 	if (file)
-		test_file(argv[1]);
+		test_file(argv[1], recv_buf_size);
 	else
 		test_server(port, recv_buf_size);