iutf8pad: fix byte-seek issue with negative width codepoints in the range >= 127 - stagit-gemini - Stagit for gemini protocol Openbsd	Err	thinkerwim.openbsd.amsterdam	70
hgit clone git://thinkerwim.org/stagit-gemini.git	URL:git://thinkerwim.org/stagit-gemini.git	thinkerwim.org	70
1Log	/git/stagit-gemini/log.gph	thinkerwim.org	70
1Files	/git/stagit-gemini/files.gph	thinkerwim.org	70
1Refs	/git/stagit-gemini/refs.gph	thinkerwim.org	70
1README	/git/stagit-gemini/file/README.gph	thinkerwim.org	70
1LICENSE	/git/stagit-gemini/file/LICENSE.gph	thinkerwim.org	70
i---	Err	thinkerwim.openbsd.amsterdam	70
1commit 05a08e8ab50a8da5b2896c3f5887801d059f48dd	/git/stagit-gemini/commit/05a08e8ab50a8da5b2896c3f5887801d059f48dd.gph	thinkerwim.org	70
1parent a9c90b585f158f98dd0997d1509e83f85dd87498	/git/stagit-gemini/commit/a9c90b585f158f98dd0997d1509e83f85dd87498.gph	thinkerwim.org	70
hAuthor: Hiltjo Posthuma <hiltjo@codemadness.org>	URL:mailto:hiltjo@codemadness.org	thinkerwim.org	70
iDate:   Sat,  9 Jan 2021 16:19:18 +0100	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
iutf8pad: fix byte-seek issue with negative width codepoints in the range >= 127	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
iFor example: "\xef\xbf\xb7" (codepoint 0xfff7), returns wcwidth(wc) == -1.	Err	thinkerwim.openbsd.amsterdam	70
iThe next byte was incorrected seeked, but the codepoint itself was valid	Err	thinkerwim.openbsd.amsterdam	70
i(mbtowc).	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
iDiffstat:	Err	thinkerwim.openbsd.amsterdam	70
i  M stagit-gopher-index.c               |       7 +++----	Err	thinkerwim.openbsd.amsterdam	70
i  M stagit-gopher.c                     |       7 +++----	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
i2 files changed, 6 insertions(+), 8 deletions(-)	Err	thinkerwim.openbsd.amsterdam	70
i---	Err	thinkerwim.openbsd.amsterdam	70
1diff --git a/stagit-gopher-index.c b/stagit-gopher-index.c	/git/stagit-gemini/file/stagit-gopher-index.c.gph	thinkerwim.org	70
i@@ -38,19 +38,18 @@ utf8pad(char *buf, size_t bufsiz, const char *s, size_t len, int pad)	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i         slen = strlen(s);	Err	thinkerwim.openbsd.amsterdam	70
i         for (i = 0; i < slen; i += inc) {	Err	thinkerwim.openbsd.amsterdam	70
i-                inc = 1;	Err	thinkerwim.openbsd.amsterdam	70
i+                inc = 1; /* next byte */	Err	thinkerwim.openbsd.amsterdam	70
i                 if ((unsigned char)s[i] < 32)	Err	thinkerwim.openbsd.amsterdam	70
i                         continue;	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i                 rl = mbtowc(&wc, &s[i], slen - i < 4 ? slen - i : 4);	Err	thinkerwim.openbsd.amsterdam	70
i+                inc = rl;	Err	thinkerwim.openbsd.amsterdam	70
i                 if (rl < 0) {	Err	thinkerwim.openbsd.amsterdam	70
i                         mbtowc(NULL, NULL, 0); /* reset state */	Err	thinkerwim.openbsd.amsterdam	70
i-                        inc = 1; /* next byte */	Err	thinkerwim.openbsd.amsterdam	70
i+                        inc = 1; /* invalid, seek next byte */	Err	thinkerwim.openbsd.amsterdam	70
i                         w = 1; /* replacement char is one width */	Err	thinkerwim.openbsd.amsterdam	70
i                 } else if ((w = wcwidth(wc)) == -1) {	Err	thinkerwim.openbsd.amsterdam	70
i                         continue;	Err	thinkerwim.openbsd.amsterdam	70
i-                } else {	Err	thinkerwim.openbsd.amsterdam	70
i-                        inc = rl;	Err	thinkerwim.openbsd.amsterdam	70
i                 }	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i                 if (col + w > len || (col + w == len && s[i + inc])) {	Err	thinkerwim.openbsd.amsterdam	70
1diff --git a/stagit-gopher.c b/stagit-gopher.c	/git/stagit-gemini/file/stagit-gopher.c.gph	thinkerwim.org	70
i@@ -100,19 +100,18 @@ utf8pad(char *buf, size_t bufsiz, const char *s, size_t len, int pad)	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i         slen = strlen(s);	Err	thinkerwim.openbsd.amsterdam	70
i         for (i = 0; i < slen; i += inc) {	Err	thinkerwim.openbsd.amsterdam	70
i-                inc = 1;	Err	thinkerwim.openbsd.amsterdam	70
i+                inc = 1; /* next byte */	Err	thinkerwim.openbsd.amsterdam	70
i                 if ((unsigned char)s[i] < 32)	Err	thinkerwim.openbsd.amsterdam	70
i                         continue;	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i                 rl = mbtowc(&wc, &s[i], slen - i < 4 ? slen - i : 4);	Err	thinkerwim.openbsd.amsterdam	70
i+                inc = rl;	Err	thinkerwim.openbsd.amsterdam	70
i                 if (rl < 0) {	Err	thinkerwim.openbsd.amsterdam	70
i                         mbtowc(NULL, NULL, 0); /* reset state */	Err	thinkerwim.openbsd.amsterdam	70
i-                        inc = 1; /* next byte */	Err	thinkerwim.openbsd.amsterdam	70
i+                        inc = 1; /* invalid, seek next byte */	Err	thinkerwim.openbsd.amsterdam	70
i                         w = 1; /* replacement char is one width */	Err	thinkerwim.openbsd.amsterdam	70
i                 } else if ((w = wcwidth(wc)) == -1) {	Err	thinkerwim.openbsd.amsterdam	70
i                         continue;	Err	thinkerwim.openbsd.amsterdam	70
i-                } else {	Err	thinkerwim.openbsd.amsterdam	70
i-                        inc = rl;	Err	thinkerwim.openbsd.amsterdam	70
i                 }	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i                 if (col + w > len || (col + w == len && s[i + inc])) {	Err	thinkerwim.openbsd.amsterdam	70
.