Changes in / [1d3ae66:fb75979] in mainline

Location:

common

Files:

• include/str.h (modified) (2 diffs)
• str.c (modified) (1 diff)

common/include/str.h

@@ -45 +45 @@
 #include <mem.h>
 #include <_bits/decls.h>
+#include <_bits/mbstate_t.h>
 #include <_bits/uchar.h>
 
@@ -86 +87 @@
 
 extern char32_t str_decode(const char *str, size_t *offset, size_t sz);
+extern char32_t str_decode_r(const char *str, size_t *offset, size_t sz,
+        char32_t replacement, mbstate_t *mbstate);
 extern char32_t str_decode_reverse(const char *str, size_t *offset, size_t sz);
 extern errno_t chr_encode(char32_t ch, char *str, size_t *offset, size_t sz);

common/str.c

@@ -427 +427 @@
         char32_t ch = _str_decode(str, offset, size, &mb);
 
-        if (ch == CHAR_INVALID)
+        if (ch == CHAR_INVALID || mb.state)
                 return U_SPECIAL;
 
-        if (mb.state)
-                return U_SPECIAL;
-
         return ch;
+}
+
+char32_t str_decode_r(const char *str, size_t *offset, size_t size,
+        char32_t replacement, mbstate_t *mb)
+{
+        char32_t ch = _str_decode(str, offset, size, mb);
+        return (ch == CHAR_INVALID) ? replacement : ch;
 }