X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/f15300499bce37cd28ea2ace0f2bd1c364fc835e..d5bc1c48d6a59db9480a3c8ce43fd8ca8a3b6a21:/ustring.c

diff --git a/ustring.c b/ustring.c
index 8cf8554..95477a5 100644
--- a/ustring.c
+++ b/ustring.c
@@ -182,7 +182,7 @@ char *utoa_locale_dup(wchar_t const *s)
     siz = wcstombs(ret, s, len);
 
     if (siz) {
-	assert(siz <= MB_CUR_MAX * len);
+	assert(siz <= (size_t)(MB_CUR_MAX * len));
 	ret[siz] = '\0';
 	ret = sresize(ret, siz+1, char);
 	return ret;
@@ -459,3 +459,28 @@ int cvt_ok(int charset, const wchar_t *s)
     }
     return TRUE;
 }
+
+/*
+ * Wrapper around charset_from_localenc which accepts the charset
+ * name as a wide string (since that happens to be more useful).
+ * Also throws a Halibut error and falls back to CS_ASCII if the
+ * charset is unrecognised, meaning the rest of the program can
+ * rely on always getting a valid charset id back from this
+ * function.
+ */
+int charset_from_ustr(filepos *fpos, const wchar_t *name)
+{
+    char *csname;
+    int charset;
+
+    csname = utoa_dup(name, CS_ASCII);
+    charset = charset_from_localenc(csname);
+
+    if (charset == CS_NONE) {
+	charset = CS_ASCII;
+	error(err_charset, fpos, name);
+    }
+
+    sfree(csname);
+    return charset;
+}