From 4733f3e99f76944ff31c60a3a18bf67d56a2edc1 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 13 Apr 2020 07:47:32 +0000
Subject: [PATCH] Fix some things.
---
src/conio/cterm.c | 9 +--------
src/conio/utf8_codepages.c | 4 ++--
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/conio/cterm.c b/src/conio/cterm.c
index 1d6e6f1b10..b66fd8a17c 100644
--- a/src/conio/cterm.c
+++ b/src/conio/cterm.c
@@ -2793,7 +2793,7 @@ static void do_ansi(struct cterminal *cterm, char *retbuf, size_t retsize, int *
TERM_XY(&col, &row);
col += seq->param_int[0];
if(col > TERM_MAXX)
- i = TERM_MAXX;
+ col = TERM_MAXX;
GOTOXY(col, row);
break;
case 'j': /* Character Position Backward */
@@ -2805,13 +2805,6 @@ static void do_ansi(struct cterminal *cterm, char *retbuf, size_t retsize, int *
col = TERM_MINX;
GOTOXY(col, row);
break;
- seq_default(seq, 0, 1);
- TERM_XY(&col, &row);
- row += seq->param_int[0];
- if(i>cterm->bottom_margin)
- i=cterm->bottom_margin;
- GOTOXY(1,i);
- break;
// for case 'E' see case 'B'
// for case 'F' see case 'A'
case '`':
diff --git a/src/conio/utf8_codepages.c b/src/conio/utf8_codepages.c
index 9e87f895ac..e92a61963a 100644
--- a/src/conio/utf8_codepages.c
+++ b/src/conio/utf8_codepages.c
@@ -213,9 +213,9 @@ cp437_to_utf8(const char *cp437str, size_t buflen, size_t *outlen)
for (idx = 0; idx < buflen; idx++) {
ch = cp437str[idx];
if (ch == 0)
- cplen += 4;
+ cplen = 4;
else if (ch < 128)
- cplen++;
+ cplen = 1;
else
cplen = utf8_bytes(ch - 128);
if (cplen == -1)
--
GitLab