diff options
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/Makefile | 2 | ||||
| -rw-r--r-- | wcsmbs/wcsmbs-tst1.c | 57 | ||||
| -rw-r--r-- | wcsmbs/wcsnrtombs.c | 16 | ||||
| -rw-r--r-- | wcsmbs/wcsrtombs.c | 15 |
4 files changed, 83 insertions, 7 deletions
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index a601489652..fa5dbef0a6 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -39,7 +39,7 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ wcscasecmp wcsncase wcscasecmp_l wcsncase_l \ wcsmbsload -tests := tst-wcstof +tests := tst-wcstof wcsmbs-tst1 include ../Rules diff --git a/wcsmbs/wcsmbs-tst1.c b/wcsmbs/wcsmbs-tst1.c new file mode 100644 index 0000000000..30a7faf33e --- /dev/null +++ b/wcsmbs/wcsmbs-tst1.c @@ -0,0 +1,57 @@ +/* Based on a test program by Won Kyu Park <wkpark@chem.skku.ac.kr>. */ + +#include <wchar.h> +#include <stdio.h> +#include <string.h> +#include <wctype.h> +#include <locale.h> + +int +main (void) +{ + int test=0, idx=0; + char buf[100], *pchar; + wchar_t tmp[10]; + wchar_t tmp1[]={L'W',L'o',L'r',L'l',L'd',L'\0'}; + char str[]="Hello"; + int result = 0; + + pchar= setlocale (LC_ALL, ""); + printf ("locale : %s\n",pchar); + printf ("MB_CUR_MAX %d\n", MB_CUR_MAX); + + puts("---- test 1 ------"); + test = mbstowcs (tmp, str, (strlen (str) + 1) * sizeof (char)); + printf ("size of string by mbstowcs %d\n", test); + if (test != strlen (str)) + result = 1; + idx += wctomb (&buf[0], tmp[0]); + idx += wctomb (&buf[idx], tmp[1]); + buf[idx] = 0; + printf ("orig string %s\n", str); + printf ("string by wctomb %s\n", buf); + printf ("string by %%C %C", tmp[0]); + if (tmp[0] != L'H') + result = 1; + printf ("%C\n", tmp[1]); + if (tmp[1] != L'e') + result = 1; + printf ("string by %%S %S\n", tmp); + if (wcscmp (tmp, L"Hello") != 0) + result = 1; + puts("---- test 2 ------"); + printf ("wchar string %S\n", tmp1); + printf ("wchar %C\n", tmp1[0]); + test = wcstombs (buf, tmp1, (wcslen (tmp1) + 1) * sizeof (wchar_t)); + printf ("size of string by wcstombs %d\n", test); + if (test != wcslen (tmp1)) + result = 1; + test = wcslen (tmp1); + printf ("size of string by wcslen %d\n", test); + printf ("char %s\n", buf); + if (strcmp (buf, "World") != 0) + result = 1; + puts("------------------"); + + return result; +} diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c index ab74e30927..18537c2a24 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.c @@ -46,7 +46,7 @@ __wcsnrtombs (dst, src, nwc, len, ps) struct gconv_step_data data; const wchar_t *srcend; int status; - size_t result = 0; + size_t result; /* Tell where we want the result. */ data.invocation_counter = 0; @@ -66,7 +66,9 @@ __wcsnrtombs (dst, src, nwc, len, ps) { char buf[256]; /* Just an arbitrary value. */ const wchar_t *inbuf = *src; + size_t dummy; + result = 0; data.outbufend = buf + sizeof (buf); do @@ -77,7 +79,10 @@ __wcsnrtombs (dst, src, nwc, len, ps) &data, (const char **) &inbuf, (const char *) srcend, - &result, 0); + &dummy, 0); + + /* Count the number of bytes. */ + result += data.outbuf - buf; } while (status == GCONV_FULL_OUTPUT); @@ -91,13 +96,18 @@ __wcsnrtombs (dst, src, nwc, len, ps) /* This code is based on the safe assumption that all internal multi-byte encodings use the NUL byte only to mark the end of the string. */ + size_t dummy; + data.outbuf = dst; data.outbufend = dst + len; status = (*__wcsmbs_gconv_fcts.tomb->fct) (__wcsmbs_gconv_fcts.tomb, &data, (const char **) src, (const char *) srcend, - &result, 0); + &dummy, 0); + + /* Count the number of bytes. */ + result = data.outbuf - dst; /* We have to determine whether the last character converted is the NUL character. */ diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index b40d14318a..fbcf0c7c5c 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -42,7 +42,7 @@ __wcsrtombs (dst, src, len, ps) { struct gconv_step_data data; int status; - size_t result = 0; + size_t result; /* Tell where we want the result. */ data.invocation_counter = 0; @@ -59,7 +59,9 @@ __wcsrtombs (dst, src, len, ps) char buf[256]; /* Just an arbitrary value. */ const wchar_t *srcend = *src + __wcslen (*src) + 1; const wchar_t *inbuf = *src; + size_t dummy; + result = 0; data.outbufend = buf + sizeof (buf); do @@ -70,7 +72,10 @@ __wcsrtombs (dst, src, len, ps) &data, (const char **) &inbuf, (const char *) srcend, - &result, 0); + &dummy, 0); + + /* Count the number of bytes. */ + result += data.outbuf - buf; } while (status == GCONV_FULL_OUTPUT); @@ -88,6 +93,7 @@ __wcsrtombs (dst, src, len, ps) multi-byte encodings use the NUL byte only to mark the end of the string. */ const wchar_t *srcend = *src + __wcsnlen (*src, len * MB_CUR_MAX) + 1; + size_t dummy; data.outbuf = dst; data.outbufend = dst + len; @@ -95,7 +101,10 @@ __wcsrtombs (dst, src, len, ps) status = (*__wcsmbs_gconv_fcts.tomb->fct) (__wcsmbs_gconv_fcts.tomb, &data, (const char **) src, (const char *) srcend, - &result, 0); + &dummy, 0); + + /* Count the number of bytes. */ + result = data.outbuf - dst; /* We have to determine whether the last character converted is the NUL character. */ |