From 2c86c59f8ac7f66d172b64a54187ba35dbded92d Mon Sep 17 00:00:00 2001
From: Bernhard Urban <lewurm@gmail.com>
Date: Mon, 18 Jun 2012 18:56:12 +0200
Subject: [PATCH] native: cleaner arraycopy

---
 ffi/native.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ffi/native.c b/ffi/native.c
index 57a688e..d143914 100644
--- a/ffi/native.c
+++ b/ffi/native.c
@@ -58,7 +58,7 @@ struct string {
 
 struct chararray {
 	unsigned int length;
-	char *str;
+	char str;
 };
 
 void java_io_PrintStream__printf_0___Ljava_lang_String__V
@@ -118,8 +118,7 @@ void java_lang_VMSystem__arraycopy___Ljava_lang_Object_ILjava_lang_Object_II_V(
 		struct chararray *dest, int dest_start, int len)
 #endif
 {
-	/* TODO(bernhard): clean please... */
-	memcpy(((char *) dest) + 4, ((char *) src) + 4 + src_start, len);
+	memcpy(&dest->str, &src->str + src_start, len);
 	dest->length = len;
 #if 0
 	hexdump(src, len + 4);
-- 
2.25.1