Replace character with U+FFFD if wcwidth() is -1

Helpful when new Unicode codepoints are not recognized by libc.

diff --git a/st.c b/st.c
index 23dd7f1..ad52280 100644 (file)
--- a/st.c
+++ b/st.c
@@ -2576,7 +2576,10 @@ tputc(char *c, int len) {
                unicodep = ascii = *c;
        } else {
                utf8decode(c, &unicodep, UTF_SIZ);
                unicodep = ascii = *c;
        } else {
                utf8decode(c, &unicodep, UTF_SIZ);

-               width = wcwidth(unicodep);
+               if ((width = wcwidth(unicodep)) == -1) {
+                       c = "\357\277\275";     /* UTF_INVALID */
+                       width = 1;
+               }

                control = ISCONTROLC1(unicodep);
                ascii = unicodep;
        }
                control = ISCONTROLC1(unicodep);
                ascii = unicodep;
        }