ifix truncation and padding for lines containing multiwidth glyphs - 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 e32410fe7894b741e141248a5e256f1e93e59fab	/git/stagit-gemini/commit/e32410fe7894b741e141248a5e256f1e93e59fab.gph	thinkerwim.org	70
1parent c1b5e802f0d0c349faf8d4e6b6988dcfdc574488	/git/stagit-gemini/commit/c1b5e802f0d0c349faf8d4e6b6988dcfdc574488.gph	thinkerwim.org	70
hAuthor: Hiltjo Posthuma <hiltjo@codemadness.org>	URL:mailto:hiltjo@codemadness.org	thinkerwim.org	70
iDate:   Sun,  1 Apr 2018 15:09:43 +0200	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
ifix truncation and padding for lines containing multiwidth glyphs	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
iDiffstat:	Err	thinkerwim.openbsd.amsterdam	70
i  M stagit-gopher.c                     |      22 +++++++++++++---------	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
i1 file changed, 13 insertions(+), 9 deletions(-)	Err	thinkerwim.openbsd.amsterdam	70
i---	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@@ -76,29 +76,33 @@ static const char *cachefile;	Err	thinkerwim.openbsd.amsterdam	70
i int	Err	thinkerwim.openbsd.amsterdam	70
i 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-        wchar_t w;	Err	thinkerwim.openbsd.amsterdam	70
i+        wchar_t wc;	Err	thinkerwim.openbsd.amsterdam	70
i         size_t col = 0, i, slen, siz = 0;	Err	thinkerwim.openbsd.amsterdam	70
i-        int rl, wc;	Err	thinkerwim.openbsd.amsterdam	70
i+        int rl, w;	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i         if (!len)	Err	thinkerwim.openbsd.amsterdam	70
i                 return -1;	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 && col < len + 1; i += rl) {	Err	thinkerwim.openbsd.amsterdam	70
i-                if ((rl = mbtowc(&w, &s[i], slen - i < 4 ? slen - i : 4)) <= 0)	Err	thinkerwim.openbsd.amsterdam	70
i+        for (i = 0; i < slen; i += rl) {	Err	thinkerwim.openbsd.amsterdam	70
i+                if ((rl = mbtowc(&wc, &s[i], slen - i < 4 ? slen - i : 4)) <= 0)	Err	thinkerwim.openbsd.amsterdam	70
i                         break;	Err	thinkerwim.openbsd.amsterdam	70
i-                if ((wc = wcwidth(w)) == -1)	Err	thinkerwim.openbsd.amsterdam	70
i-                        wc = 1;	Err	thinkerwim.openbsd.amsterdam	70
i-                col += wc;	Err	thinkerwim.openbsd.amsterdam	70
i-                if (col >= len && s[i + rl]) {	Err	thinkerwim.openbsd.amsterdam	70
i+                if ((w = wcwidth(wc)) == -1)	Err	thinkerwim.openbsd.amsterdam	70
i+                        continue;	Err	thinkerwim.openbsd.amsterdam	70
i+                if (col + w > len || (col + w == len && s[i + rl])) {	Err	thinkerwim.openbsd.amsterdam	70
i                         if (siz + 4 >= bufsiz)	Err	thinkerwim.openbsd.amsterdam	70
i                                 return -1;	Err	thinkerwim.openbsd.amsterdam	70
i-                        memcpy(&buf[siz], "\xe2\x80\xa6", 4);	Err	thinkerwim.openbsd.amsterdam	70
i+                        memcpy(&buf[siz], "\xe2\x80\xa6", 3);	Err	thinkerwim.openbsd.amsterdam	70
i+                        siz += 3;	Err	thinkerwim.openbsd.amsterdam	70
i+                        if (col + w == len && w > 1)	Err	thinkerwim.openbsd.amsterdam	70
i+                                buf[siz++] = pad;	Err	thinkerwim.openbsd.amsterdam	70
i+                        buf[siz] = '\0';	Err	thinkerwim.openbsd.amsterdam	70
i                         return 0;	Err	thinkerwim.openbsd.amsterdam	70
i                 }	Err	thinkerwim.openbsd.amsterdam	70
i                 if (siz + rl + 1 >= bufsiz)	Err	thinkerwim.openbsd.amsterdam	70
i                         return -1;	Err	thinkerwim.openbsd.amsterdam	70
i                 memcpy(&buf[siz], &s[i], rl);	Err	thinkerwim.openbsd.amsterdam	70
i+                col += w;	Err	thinkerwim.openbsd.amsterdam	70
i                 siz += rl;	Err	thinkerwim.openbsd.amsterdam	70
i                 buf[siz] = '\0';	Err	thinkerwim.openbsd.amsterdam	70
i         }	Err	thinkerwim.openbsd.amsterdam	70
.