From ef496ce0d828e11d34d53c221d6e574a100f7c14 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Mon, 21 Dec 2015 12:13:21 +0000
Subject: [PATCH] TextTeader: fix issue there was old data after converting
 text to UTF8

git-svn-id: svn://kolibrios.org@5995 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/lib/font.h                | 1 -
 programs/cmm/textreader/compile.bat    | 1 -
 programs/cmm/textreader/prepare_page.h | 9 +++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/programs/cmm/lib/font.h b/programs/cmm/lib/font.h
index 2f449f55db..6715b7cdf7 100644
--- a/programs/cmm/lib/font.h
+++ b/programs/cmm/lib/font.h
@@ -143,7 +143,6 @@
 		byte rw=0;
 		IF(s==32)return width/4;
 		IF(s==9)return width;
-		debugch(s);
 		s = Cp866ToAnsi(s);
 		EBX = block*s << 2 + font;
 		for(yi=0; yi<height; yi++)
diff --git a/programs/cmm/textreader/compile.bat b/programs/cmm/textreader/compile.bat
index b83277026f..09979a1c57 100644
--- a/programs/cmm/textreader/compile.bat
+++ b/programs/cmm/textreader/compile.bat
@@ -3,4 +3,3 @@ C-- "textreader.c"
 @rename "textreader.com" "textreader"
 @del warning.txt
 @pause
-kpack textreader
\ No newline at end of file
diff --git a/programs/cmm/textreader/prepare_page.h b/programs/cmm/textreader/prepare_page.h
index b2d30defed..1c3201d2a7 100644
--- a/programs/cmm/textreader/prepare_page.h
+++ b/programs/cmm/textreader/prepare_page.h
@@ -4,18 +4,19 @@ void PreparePage()
 	char char_width[255];
 	dword line_start;
 	byte ch;
-	dword bufoff;
+	dword bufoff, buflen;
 	dword line_length=30;
 	dword stroka_y = 5;
 	dword stroka=0;
 	int i, srch_pos;
-	
+
 	label.changeSIZE();
 	list.w = Form.cwidth-scroll.size_x-1;
 	//get font chars width, need to increase performance
 	for (i=0; i<256; i++) char_width[i] = label.symbol_size(i);
 	//get font buffer height
-	for (bufoff=io.buffer_data; ESBYTE[bufoff]; bufoff++)
+	buflen = strlen(io.buffer_data) + io.buffer_data;
+	for (bufoff=io.buffer_data; bufoff<buflen; bufoff++)
 	{
 		ch = ESBYTE[bufoff];
 		line_length += char_width[ch];
@@ -42,7 +43,7 @@ void PreparePage()
 
 	line_length = 30;
 	line_start = io.buffer_data;
-	for (bufoff=io.buffer_data; ESBYTE[bufoff]; bufoff++)
+	for (bufoff=io.buffer_data; bufoff<buflen; bufoff++)
 	{
 		ch = ESBYTE[bufoff];
 		line_length += char_width[ch];