shithub: femtolisp

Info  •  Files  •  Log  •  Branches

ios_getutf8: don't update column number on bad runes

--- a/ios.c

+++ b/ios.c

@@ -834,8 +834,12 @@

 		ch = s->buf[s->bpos++];

 	else if(s->_eof || ios_read(s, &ch, 1) < 1)

 		return IOS_EOF;

-	if(ch == '\n')

+	if(ch == '\n'){

 		s->lineno++;

+		s->colno = 0;

+	}else{

+		s->colno++;

+	}

 	return ch;

 }

@@ -895,11 +899,13 @@

 			break;

 	}

 	chartorune(r, buf);

+	if(*r == Runeerror)

+		return 0;

 	if(*r == '\n')

 		s->colno = 0;

 	else

 		s->colno += wcwidth(*r);

-	return *r == Runeerror ? 0 : 1;

+	return 1;

 }

 int