From 4b4d077857cfa18a6d1490ca759449915026c070 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 15 Aug 2006 23:56:19 +0000
Subject: [PATCH] fix stdout Window, especially when displaying symbols

svn: r4068
---
 src/mred/mred.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mred/mred.cxx b/src/mred/mred.cxx
index 331611ac65..5d5150efac 100644
--- a/src/mred/mred.cxx
+++ b/src/mred/mred.cxx
@@ -2432,6 +2432,10 @@ static FILE *mrerr = NULL;
 
 #endif /* WINDOW_STDIO */
 
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
 #if REDIRECT_STDIO || WINDOW_STDIO || WCONSOLE_STDIO
 static void MrEdSchemeMessages(char *msg, ...)
 {
@@ -2511,8 +2515,8 @@ static void MrEdSchemeMessages(char *msg, ...)
     ulen = scheme_utf8_decode_as_prefix((unsigned char *)s, d, l,
 					NULL, 0, -1,
 					&ipos, 0, '?');
-    utf8_leftover_count = (l - ipos);
-    memcpy(utf8_leftover, s + d + ipos, utf8_leftover_count);
+    utf8_leftover_count = (l - (ipos - d));
+    memcpy(utf8_leftover, s + ipos, utf8_leftover_count);
     
     us = (wxchar *)scheme_malloc_atomic(sizeof(wxchar) * ulen);
     scheme_utf8_decode_as_prefix((unsigned char *)s, d, l,