From d9e22a9a54c273bdcf7df1df32b79bbd099ae737 Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Sun, 21 Sep 2014 22:34:27 +0100
Subject: [PATCH] small fix

---
 Makefile.am          |  9 ++++++++-
 src/protocol_raw.c   | 10 +++++++---
 testers/testclient.c | 13 ++++++++++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a7936ed..d5670a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,5 +16,12 @@ coverage-html:
 	-$(MAKE) -C tests $(AM_MAKEFLAGS) -k $@
 endif
 
+REGEX_CCLASS=/^[ \t]*\(TR_CLASS\|TR_INTERFACE\)\(([a-zA-Z0-9_]+)/\2/d,definition/
 tags:
-	ctags -R -V --langdef=cclass --langmap=cclass:.h --regex-cclass='/^[ \t]*\(TR_CLASS\|TR_INTERFACE\)\(([a-zA-Z0-9_]+)/\2/d,definition/'
+	@ctags -R -V --langdef=cclass --langmap=cclass:.h \
+		--regex-cclass='$(REGEX_CCLASS)'
+
+loc:
+	@find src/ include/ -not -path testers -and -name "*.[ch]" \
+		-exec sed '/\/\*/,/\*\//d;/\/\//d' {} \; | wc -l
+
diff --git a/src/protocol_raw.c b/src/protocol_raw.c
index b58eaae..c5b4169 100644
--- a/src/protocol_raw.c
+++ b/src/protocol_raw.c
@@ -81,7 +81,11 @@ protocolRawParse(void * _this, TR_ProtoMessage _message, TR_RemoteData _data)
 	}
 
 	if (size >= message->size - message->size_done) {
-		memcpy(message->data, data, message->size - message->size_done);
+		memcpy(
+				message->data + message->size_done,
+				data,
+				message->size - message->size_done);
+
 		size -= message->size - message->size_done;
 		data += message->size - message->size_done;
 		message->size_done = message->size;
@@ -91,8 +95,8 @@ protocolRawParse(void * _this, TR_ProtoMessage _message, TR_RemoteData _data)
 			retval = TR_new(TR_RemoteData, data, size, _data->remote);
 		}
 	} else {
-		memcpy(message->data, data, size);
-		message->size_done = size;
+		memcpy(message->data + message->size_done, data, size);
+		message->size_done += size;
 	}
 
 	TR_delete(_data);
diff --git a/testers/testclient.c b/testers/testclient.c
index ec2b106..d133ee0 100644
--- a/testers/testclient.c
+++ b/testers/testclient.c
@@ -32,7 +32,7 @@ main (int argc, char * argv[])
 
 	client = TR_new(TR_SimpleClient, connection);
 
-	for (i=0; i<100000; i++) {
+	for (i=0; i<10000000; i++) {
 		message = (TR_ProtoMessageRaw)TR_protoCreateRequest(
 				protocol, (TR_Socket)socket);
 		message->size = sizeof("test");
@@ -42,13 +42,20 @@ main (int argc, char * argv[])
 		message = (TR_ProtoMessageRaw)TR_simpleClientIssue(
 				client,
 				(TR_ProtoMessage)message,
-				10000000);
+				100);
 
+		if (! message) break;
 #if 0
 		printf("%s\n", message->data);
 #else
 		if (0 == strncmp("test", message->data, sizeof("test")-1)) {
-			if (i % 1000 == 0) printf("%c", '.');
+			if (i % 1000 == 0) {
+				if (i % 10000 == 0) {
+					printf("%c", '#');
+				} else {
+					printf("%c", '.');
+				}
+			}
 		} else {
 			printf("%c", 'f');
 		}