Add compat code for missing wcwidth.

If we don't have wcwidth force fallback implementations of nl_langinfo
and mbtowc.  Based on advice from Ingo Schwarze.

1 files changed, 17 insertions, 0 deletions

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 2a788e47f..18bf62dd8 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -284,3 +284,20 @@ pledge(const char *promises, const char *paths[])
         return 0;
 }
 #endif
+
+#ifndef HAVE_MBTOWC
+/* a mbtowc that only supports ASCII */
+int
+mbtowc(wchar_t *pwc, const char *s, size_t n)
+{
+        if (s == NULL || *s == '\0')
+                return 0;       /* ASCII is not state-dependent */
+        if (*s < 0 || *s > 0x7f || n < 1) {
+                errno = EOPNOTSUPP;
+                return -1;
+        }
+        if (pwc != NULL)
+                *pwc = *s;
+        return 1;
+}
+#endif