X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fencoding.h;h=b48fe9ced389568fac1f1de3da12b479d6168323;hp=ff3c2ae61e2a44044e1145279514d38fdfecbb37;hb=fe221b8f000dbd52b884d1ac71d75f49a44cc05c;hpb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518

diff --git a/include/wimlib/encoding.h b/include/wimlib/encoding.h
index ff3c2ae6..b48fe9ce 100644
--- a/include/wimlib/encoding.h
+++ b/include/wimlib/encoding.h
@@ -1,11 +1,21 @@
 #ifndef _WIMLIB_ENCODING_H
 #define _WIMLIB_ENCODING_H
 
+#include "wimlib/error.h"
+#include "wimlib/util.h"
 #include "wimlib/types.h"
 
+#include <string.h>
+
+extern void
+iconv_global_init(void);
+
 extern void
 iconv_global_cleanup(void);
 
+extern void
+init_upcase(void);
+
 extern bool wimlib_mbs_is_utf8;
 
 #define DECLARE_CHAR_CONVERSION_FUNCTIONS(varname1, varname2,		\
@@ -24,16 +34,113 @@ extern int								\
 varname1##_to_##varname2##_buf(const chartype1 *in, size_t in_nbytes,	\
 			       chartype2 *out);
 
+extern utf16lechar *
+utf16le_dupz(const utf16lechar *ustr, size_t usize);
 
 #if !TCHAR_IS_UTF16LE
 DECLARE_CHAR_CONVERSION_FUNCTIONS(utf16le, tstr, utf16lechar, tchar);
 DECLARE_CHAR_CONVERSION_FUNCTIONS(tstr, utf16le, tchar, utf16lechar);
+#else
+
+static inline int
+tstr_to_utf16le(const tchar *tstr, size_t tsize,
+		utf16lechar **ustr_ret, size_t *usize_ret)
+{
+	utf16lechar *ustr = utf16le_dupz(tstr, tsize);
+	if (!ustr)
+		return WIMLIB_ERR_NOMEM;
+	*ustr_ret = ustr;
+	*usize_ret = tsize;
+	return 0;
+}
+
+#define utf16le_to_tstr tstr_to_utf16le
+
 #endif
 
+DECLARE_CHAR_CONVERSION_FUNCTIONS(utf8, tstr, char, tchar);
+DECLARE_CHAR_CONVERSION_FUNCTIONS(tstr, utf8, tchar, char);
+
 extern int
 utf8_to_tstr_simple(const char *utf8str, tchar **out);
 
 extern int
 tstr_to_utf8_simple(const tchar *tstr, char **out);
 
+extern int
+cmp_utf16le_strings(const utf16lechar *s1, size_t n1,
+		    const utf16lechar *s2, size_t n2,
+		    bool ignore_case);
+
+/* Convert a string in the platform-dependent encoding to UTF-16LE, but if both
+ * encodings are UTF-16LE, simply re-use the string.  Release with
+ * tstr_put_utf16le() when done.  */
+static inline int
+tstr_get_utf16le_and_len(const tchar *tstr,
+			 const utf16lechar **ustr_ret, size_t *usize_ret)
+{
+	size_t tsize = tstrlen(tstr) * sizeof(tchar);
+#if TCHAR_IS_UTF16LE
+	/* No conversion or copy needed  */
+	*ustr_ret = tstr;
+	*usize_ret = tsize;
+	return 0;
+#else
+	return tstr_to_utf16le(tstr, tsize, (utf16lechar **)ustr_ret, usize_ret);
+#endif
+}
+
+/* Convert a string in the platform-dependent encoding to UTF-16LE, but if both
+ * encodings are UTF-16LE, simply re-use the string.  Release with
+ * tstr_put_utf16le() when done.  */
+static inline int
+tstr_get_utf16le(const tchar *tstr, const utf16lechar **ustr_ret)
+{
+#if TCHAR_IS_UTF16LE
+	/* No conversion or copy needed  */
+	*ustr_ret = tstr;
+	return 0;
+#else
+	size_t tsize = tstrlen(tstr) * sizeof(tchar);
+	size_t dummy;
+	return tstr_to_utf16le(tstr, tsize, (utf16lechar **)ustr_ret, &dummy);
+#endif
+}
+
+/* Release a string acquired with tstr_get_utf16le() or
+ * tstr_get_utf16le_and_len().  */
+static inline void
+tstr_put_utf16le(const utf16lechar *ustr)
+{
+#if !TCHAR_IS_UTF16LE
+	FREE((void *)ustr);
+#endif
+}
+
+/* Convert a UTF16-LE string to the platform-dependent encoding, but if both
+ * encodings are UTF-16LE, simply re-use the string.  Release with
+ * utf16le_put_tstr() when done.  */
+static inline int
+utf16le_get_tstr(const utf16lechar *ustr, size_t usize,
+		 const tchar **tstr_ret, size_t *tsize_ret)
+{
+#if TCHAR_IS_UTF16LE
+	/* No conversion or copy needed  */
+	*tstr_ret = ustr;
+	*tsize_ret = usize;
+	return 0;
+#else
+	return utf16le_to_tstr(ustr, usize, (tchar **)tstr_ret, tsize_ret);
+#endif
+}
+
+/* Release a string acquired with utf16le_get_tstr().  */
+static inline void
+utf16le_put_tstr(const tchar *tstr)
+{
+#if !TCHAR_IS_UTF16LE
+	FREE((void *)tstr);
+#endif
+}
+
 #endif /* _WIMLIB_ENCODING_H */