diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-05-21 15:40:14 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-05-21 15:40:14 +0000 |
| commit | 23f0c99c0eb54cd481167d5927dafc1650bcbca1 (patch) | |
| tree | cd1db4054738b46da815bf3a258b143b20063170 /wcsmbs/wcsrtombs.c | |
| parent | 32c85e43ed25cc954cb9ba62a6aad7c9338a2a08 (diff) | |
| download | glibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.tar.gz glibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.tar.xz glibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.zip | |
Update.
1998-05-21 15:27 Ulrich Drepper <drepper@cygnus.com> * wcsmbs/wcsnrtombs.c: Correct computation of result. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/Makefile (tests): Add wcsmbs-tst1.c. * wcsmbs/wcsmbs-tst1.c: New file. * iconv/loop.c (COUNT_CONVERTED): Correct computation. * locale/C-ctype.c (_nl_C_LC_CTYPE): Define MB_CUR_MAX for C locale as 1. * locale/setlocale.c: Don't make _nl_current_* and _nl_C_* references weak. 1998-05-21 Philip Blundell <philb@gnu.org> * sysdeps/arm/fpu_control.h: Replace stub file with real implementation. * sysdeps/arm/fpu/bits/fenv.h: New file. * sysdeps/arm/fpu/fesetround.c: Likewise. * sysdeps/arm/fpu/fclrexcpt.c: Likewise. * sysdeps/arm/fpu/fsetexcptflag.c: Likewise. * sysdeps/arm/fpu/ftestexcpt.c: Likewise. * sysdeps/arm/fpu/fraiseexcpt.c: Likewise. * sysdeps/arm/fpu/fegetenv.c: Likewise. * sysdeps/arm/fpu/fesetenv.c: Likewise. 1998-05-21 16:34 Richard Henderson <rth@cygnus.com> * elf/dl-load.c (_dl_map_object_from_fd): Get file header with read instead of mmap.
Diffstat (limited to 'wcsmbs/wcsrtombs.c')
| -rw-r--r-- | wcsmbs/wcsrtombs.c | 15 |
1 files changed, 12 insertions, 3 deletions
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. */ |