X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futf8.h;h=77f663438e9c3465c4a1695b5879f41ba8fa3823;hb=11689d2a021d95a8447d938180e0962cd9439763;hp=13d2f6a980e348ee362e9a4aecd06fd8c742b0c2;hpb=c2f1db8f83618e60dcded8303d14656d7d26b436;p=elogind.git
diff --git a/src/shared/utf8.h b/src/shared/utf8.h
index 13d2f6a98..77f663438 100644
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -21,12 +21,35 @@
along with systemd; If not, see .
***/
+#include
+
#include "macro.h"
-char *utf8_is_valid(const char *s) _pure_;
+#define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
+
+const char *utf8_is_valid(const char *s) _pure_;
char *ascii_is_valid(const char *s) _pure_;
-char *utf8_is_printable_n(const char* str, size_t length) _pure_;
+bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pure_;
+#define utf8_is_printable(str, length) utf8_is_printable_newline(str, length, true)
+
+char *utf8_escape_invalid(const char *s);
+char *utf8_escape_non_printable(const char *str);
+
+size_t utf8_encode_unichar(char *out_utf8, uint32_t g);
+char *utf16_to_utf8(const void *s, size_t length);
+
+int utf8_encoded_valid_unichar(const char *str);
+int utf8_encoded_to_unichar(const char *str);
+
+static inline bool utf16_is_surrogate(uint16_t c) {
+ return (0xd800 <= c && c <= 0xdfff);
+}
+
+static inline bool utf16_is_trailing_surrogate(uint16_t c) {
+ return (0xdc00 <= c && c <= 0xdfff);
+}
-char *utf8_filter(const char *s);
-char *ascii_filter(const char *s);
+static inline uint32_t utf16_surrogate_pair_to_unichar(uint16_t lead, uint16_t trail) {
+ return ((lead - 0xd800) << 10) + (trail - 0xdc00) + 0x10000;
+}