X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=st.c;h=7051a4a28534292b02237705ae73d0e62d0ad929;hb=9eb70a2d3ecbd96a92e5f824868500baba74b688;hp=68dc2be75d8dab4dbfbb094d4f10eafec9c9ace1;hpb=c9357a8edfe6d047da95b85c5f3c18b9db40d172;p=st.git

diff --git a/st.c b/st.c
index 68dc2be..7051a4a 100644
--- a/st.c
+++ b/st.c
@@ -2272,12 +2272,23 @@ strhandle(void) {
 
 void
 strparse(void) {
+	int c;
 	char *p = strescseq.buf;
 
 	strescseq.narg = 0;
 	strescseq.buf[strescseq.len] = '\0';
-	while(p && strescseq.narg < STR_ARG_SIZ)
-		strescseq.args[strescseq.narg++] = strsep(&p, ";");
+
+	if(*p == '\0')
+		return;
+
+	while(strescseq.narg < STR_ARG_SIZ) {
+		strescseq.args[strescseq.narg++] = p;
+		while((c = *p) != ';' && c != '\0')
+			++p;
+		if(c == '\0')
+			return;
+		*p++ = '\0';
+	}
 }
 
 void
@@ -2379,7 +2390,7 @@ tputtab(int n) {
 			for(--x; x > 0 && !term.tabs[x]; --x)
 				/* nothing */ ;
 	}
-	tmoveto(x, term.c.y);
+	term.c.x = LIMIT(x, 0, term.col-1);
 }
 
 void
@@ -2637,7 +2648,6 @@ tputc(char *c, int len) {
 			c = "\357\277\275";	/* UTF_INVALID */
 			width = 1;
 		}
-		control = ISCONTROLC1(unicodep);
 		ascii = unicodep;
 	}
 
@@ -2652,7 +2662,7 @@ tputc(char *c, int len) {
 	 * character.
 	 */
 	if(term.esc & ESC_STR) {
-		if(width == 1 &&
+		if(len == 1 &&
 		   (ascii == '\a' || ascii == 030 ||
 		    ascii == 032  || ascii == 033 ||
 		    ISCONTROLC1(unicodep))) {