drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-10-23 Jeff Johnston <jjohnstn@redhat.com> 

* libc/stdlib/wcstombs_r.c: Add SUSV2 support for calculating
        size if output buffer is NULL.
This commit is contained in:
Jeff Johnston 2007-10-23 19:50:29 +00:00
parent 09ecdc8504
commit 2a3a02a687
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2007-10-23 Jeff Johnston <jjohnstn@redhat.com>
* libc/stdlib/wcstombs_r.c: Add SUSV2 support for calculating
size if output buffer is NULL.
2007-10-17 Jeff Johnston <jjohnstn@redhat.com> 2007-10-17 Jeff Johnston <jjohnstn@redhat.com>
* libm/mathfp/s_logarithm.c: Fix error introduced by previous * libm/mathfp/s_logarithm.c: Fix error introduced by previous

35
newlib/libc/stdlib/wcstombs_r.c
View File

@ -14,20 +14,29 @@ _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
char buff[8]; char buff[8];
int i, num_to_copy; int i, num_to_copy;
while (n > 0) if (s == NULL)
{ {
int bytes = _wctomb_r (r, buff, *pwcs, state); size_t num_bytes = 0;
if (bytes == -1) while (*pwcs != 0)
return -1; num_bytes += _wctomb_r (r, buff, *pwcs++, state);
num_to_copy = (n > bytes ? bytes : (int)n); return num_bytes;
for (i = 0; i < num_to_copy; ++i)
*ptr++ = buff[i];
if (*pwcs == 0x00)
return ptr - s - (n >= bytes);
++pwcs;
n -= num_to_copy;
} }
else
{
while (n > 0)
{
int bytes = _wctomb_r (r, buff, *pwcs, state);
if (bytes == -1)
return -1;
num_to_copy = (n > bytes ? bytes : (int)n);
for (i = 0; i < num_to_copy; ++i)
*ptr++ = buff[i];
return max; if (*pwcs == 0x00)
return ptr - s - (n >= bytes);
++pwcs;
n -= num_to_copy;
}
return max;
}
} }