X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fuchar%2Fc16rtomb.c;h=bce172bd00ff070a5095d33747ff273d56b8021b;hp=e8f1de780597eb44d4e0b3c6a4356e9bd89f5ba6;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=db384a5b4db8611b58a125a1f8504a3785f26566

diff --git a/functions/uchar/c16rtomb.c b/functions/uchar/c16rtomb.c
index e8f1de7..bce172b 100644
--- a/functions/uchar/c16rtomb.c
+++ b/functions/uchar/c16rtomb.c
@@ -1,7 +1,4 @@
-/* c16rtomb(
-    char        *restrict   s, 
-    char16_t                c16,
-    mbstate_t   *restrict   ps);
+/* c16rtomb( char *, char16_t, mbstate_t * )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
@@ -13,8 +10,8 @@
 #include <stdint.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <_PDCLIB_encoding.h>
-#include <_PDCLIB_locale.h>
+#include "_PDCLIB_encoding.h"
+#include "_PDCLIB_locale.h"
 
 size_t c16rtomb_l(
     char        *restrict   s, 
@@ -24,6 +21,8 @@ size_t c16rtomb_l(
 )
 {
     const char16_t *restrict psrc = &c16;
+    char buf[s ? 0 : MB_CUR_MAX];
+    s =      s ? s : buf;
 
     if(!l->_Codec->__c16stombs) {
         // Codec doesn't support direct conversion - translate via UCS-4
@@ -58,6 +57,7 @@ size_t c16rtomb_l(
             if((c16 & 0xFC00) == 0xDC00) {
                 // Trailing surrogate
                 char32_t c32 = (ps->_Surrogate & 0x3FF) << 10 | (c16 & 0x3FF);
+                ps->_Surrogate = 0;
                 return c32rtomb_l(s, c32, ps, l);
             } else {
                 // Not a trailing surrogate - encoding error
@@ -94,7 +94,7 @@ size_t c16rtomb(
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {