From 0df8bd51aa70cfa66951e8f08a6a3dce3fd45dec Mon Sep 17 00:00:00 2001
From: C. McEnroe
Date: Tue, 4 Feb 2020 21:27:52 -0500
Subject: Convert editHead and editTail from wchar_t
---
edit.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/edit.c b/edit.c
index 446e0e9..e142507 100644
--- a/edit.c
+++ b/edit.c
@@ -14,17 +14,31 @@
* along with this program. If not, see .
*/
-#include
+#include
+#include
#include
#include
-#include
+#include
#include "chat.h"
+enum { Cap = 512 };
+static wchar_t buf[Cap] = L"foo\0033bar\3baz";
+static size_t len = 12;
+static size_t pos = 6;
+
const char *editHead(void) {
- return "foo\0033bar";
+ static char mbs[MB_LEN_MAX * Cap];
+ const wchar_t *ptr = buf;
+ size_t n = wcsnrtombs(mbs, &ptr, pos, sizeof(mbs), NULL);
+ assert(n != (size_t)-1);
+ return mbs;
}
const char *editTail(void) {
- return "baz\3";
+ static char mbs[MB_LEN_MAX * Cap];
+ const wchar_t *ptr = &buf[pos];
+ size_t n = wcsnrtombs(mbs, &ptr, len - pos, sizeof(mbs), NULL);
+ assert(n != (size_t)-1);
+ return mbs;
}
--
cgit 1.4.1-2-gfad0