aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs/wcsnrtombs.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-21 15:40:14 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-21 15:40:14 +0000
commit23f0c99c0eb54cd481167d5927dafc1650bcbca1 (patch)
treecd1db4054738b46da815bf3a258b143b20063170 /wcsmbs/wcsnrtombs.c
parent32c85e43ed25cc954cb9ba62a6aad7c9338a2a08 (diff)
downloadglibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.zip
glibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.tar.gz
glibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.tar.bz2
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/wcsnrtombs.c')
-rw-r--r--wcsmbs/wcsnrtombs.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
index ab74e30..18537c2 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. */