Changes in common/str.c [b31323f:45adeeb] in mainline

File:

• common/str.c (modified) (1 diff)

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;
 }