From b6581e98d7634454780dbbda0ae3f1b1e6f07b7d Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 5 Aug 2013 20:15:41 -0700
Subject: [PATCH] Implement read.

---
 src/libguac/unicode.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/libguac/unicode.c b/src/libguac/unicode.c
index b57509f5..d2e6eeb2 100644
--- a/src/libguac/unicode.c
+++ b/src/libguac/unicode.c
@@ -143,6 +143,7 @@ int guac_utf8_read(const char* utf8, int length, int* codepoint) {
     unsigned char initial;
     int bytes;
     int result;
+    int i;
 
     /* If not even one byte, cannot read */
     if (length <= 0)
@@ -185,7 +186,11 @@ int guac_utf8_read(const char* utf8, int length, int* codepoint) {
     if (bytes > length)
         return 0;
 
-    /* STUB: Read. */
+    /* Read trailing bytes, if any */
+    for (i=1; i<bytes; i++) {
+        result <<= 6;
+        result |= *(utf8++) & 0x3F;
+    }
 
     *codepoint = result;
     return bytes;