diff options
author | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2012-09-25 21:04:35 +0200 |
---|---|---|
committer | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2012-09-25 21:04:35 +0200 |
commit | 2ca5d9463dd5d8e6745b9b2996e3bd734b601ce2 (patch) | |
tree | 9329d16d8dd3c84d7e8b5f0aa0e0299d54f8f1fb | |
parent | 33eaeacaa45cf3d4f9c0f07136ae240d2611f070 (diff) | |
download | st-patched-2ca5d9463dd5d8e6745b9b2996e3bd734b601ce2.tar.bz2 st-patched-2ca5d9463dd5d8e6745b9b2996e3bd734b601ce2.tar.xz st-patched-2ca5d9463dd5d8e6745b9b2996e3bd734b601ce2.zip |
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(-)
-rw-r--r-- | st.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -278,7 +278,7 @@ static void tmoveto(int, int); | |||
278 | static void tnew(int, int); | 278 | static void tnew(int, int); |
279 | static void tnewline(int); | 279 | static void tnewline(int); |
280 | static void tputtab(bool); | 280 | static void tputtab(bool); |
281 | static void tputc(char*); | 281 | static void tputc(char*, int); |
282 | static void treset(void); | 282 | static void treset(void); |
283 | static int tresize(int, int); | 283 | static int tresize(int, int); |
284 | static void tscrollup(int, int); | 284 | static void tscrollup(int, int); |
@@ -884,7 +884,7 @@ ttyread(void) { | |||
884 | while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) { | 884 | while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) { |
885 | charsize = utf8decode(ptr, &utf8c); | 885 | charsize = utf8decode(ptr, &utf8c); |
886 | utf8encode(&utf8c, s); | 886 | utf8encode(&utf8c, s); |
887 | tputc(s); | 887 | tputc(s, charsize); |
888 | ptr += charsize; | 888 | ptr += charsize; |
889 | buflen -= charsize; | 889 | buflen -= charsize; |
890 | } | 890 | } |
@@ -1641,11 +1641,11 @@ tputtab(bool forward) { | |||
1641 | } | 1641 | } |
1642 | 1642 | ||
1643 | void | 1643 | void |
1644 | tputc(char *c) { | 1644 | tputc(char *c, int len) { |
1645 | char ascii = *c; | 1645 | char ascii = *c; |
1646 | 1646 | ||
1647 | if(iofd != -1) | 1647 | if(iofd != -1) |
1648 | write(iofd, c, 1); | 1648 | write(iofd, c, len); |
1649 | 1649 | ||
1650 | if(term.esc & ESC_START) { | 1650 | if(term.esc & ESC_START) { |
1651 | if(term.esc & ESC_CSI) { | 1651 | if(term.esc & ESC_CSI) { |