Libc-1439.100.3.tar.gz

[apple/libc.git] / locale / FreeBSD / gb18030.c

diff --git a/locale/FreeBSD/gb18030.c b/locale/FreeBSD/gb18030.c
index c63d05028c0bd1e0d80a46fb586ff2a74d0a7188..baeaada1bb84614ea6d475b9aee7046f1a7fef0d 100644 (file)
--- a/locale/FreeBSD/gb18030.c
+++ b/locale/FreeBSD/gb18030.c
@@ -54,7 +54,7 @@ typedef struct {
        u_char  bytes[4];
 } _GB18030State;
 
-__private_extern__ int
+int
 _GB18030_init(struct __xlocale_st_runelocale *xrl)
 {
 
@@ -97,7 +97,7 @@ _GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
        }
 
        ncopy = MIN(MIN(n, GB18030_MB_CUR_MAX), sizeof(gs->bytes) - gs->count);
-       memcpy(gs->bytes + gs->count, s, ncopy);
+       strncpy((char*)(gs->bytes + gs->count), s, ncopy);
        ocount = gs->count;
        gs->count += ncopy;
        s = (char *)gs->bytes;