[hackers] [st] Fix bug in tputc writing to io file || "Roberto E. Vargas Caballero"

From: <hg_AT_suckless.org>
Date: Tue, 25 Sep 2012 21:06:59 +0200 (CEST)

changeset: 332:b0814434287b
tag: tip
user: "Roberto E. Vargas Caballero" <k0ga_AT_shike2.com>
date: Tue Sep 25 21:04:35 2012 +0200
files: st.c
description:
Fix bug in tputc writing to io file
If -f options is enabled then tputc() writes all the data to a file. Actual
code assumes that all the strings in 'c' parameters have always 1 byte
length, but this is not always true, because due to utf-8 encoding some
characters can have a diferent length. So it is necessary pass string length
to tputc in order it can call to write() correctly.

---
 st.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff -r 54f93cae07e9 -r b0814434287b st.c
--- a/st.c	Mon Sep 24 14:01:59 2012 +0200
+++ b/st.c	Tue Sep 25 21:04:35 2012 +0200
_AT_@ -278,7 +278,7 @@
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
-static void tputc(char*);
+static void tputc(char*, int);
 static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
_AT_@ -884,7 +884,7 @@
 	while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
 		charsize = utf8decode(ptr, &utf8c);
 		utf8encode(&utf8c, s);
-		tputc(s);
+		tputc(s, charsize);
 		ptr    += charsize;
 		buflen -= charsize;
 	}
_AT_@ -1641,11 +1641,11 @@
 }
 
 void
-tputc(char *c) {
+tputc(char *c, int len) {
 	char ascii = *c;
 
 	if(iofd != -1)
-		write(iofd, c, 1);
+		write(iofd, c, len);
 
 	if(term.esc & ESC_START) {
 		if(term.esc & ESC_CSI) {

Received on Tue Sep 25 2012 - 21:06:59 CEST