attempt to deal with the portability fiasco of strnvis(3)

1 files changed, 17 insertions, 0 deletions

diff --git a/utils.c b/utils.c
index 7ceea2e..bbb6b11 100644
--- a/utils.c
+++ b/utils.c
@@ -22,6 +22,7 @@
 
 #include <errno.h>
 #include <string.h>
+#include <vis.h>	/* for gmid_strnvis() */
 
 #include <openssl/ec.h>
 #include <openssl/err.h>
@@ -496,3 +497,19 @@ new_proxy(void)
 	p->protocols = TLS_PROTOCOLS_DEFAULT;
 	return p;
 }
+
+/*
+ * I can't rant enough about this situation.  As far as I've understood,
+ * OpenBSD introduced strnvis(3) with a signature, then NetBSD did it but
+ * with a incompatible signature.  FreeBSD followed NetBSD.  libbsd followed
+ * OpenBSD but now is thinking to switch.  WTF?
+ */
+int
+gmid_strnvis(char *dst, const char *src, size_t destsize, int flag)
+{
+#if HAVE_BROKEN_STRNVIS
+	return strnvis(dst, destsize, src, flag);
+#else
+	return strnvis(dst, src, destsize, flag);
+#endif
+}