Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

C89/AMD1: mbsrtowcs() and wcsrtombs() are not to return the terminating

Browse Source 
null; also correct the corresponding conversion loop exit in mbsrtowcs().
From YAMAMOTO Takashi in PR lib/13016.
This commit is contained in:
kleink 2001-05-26 13:18:42 +00:00
parent 46636f1249
commit 6d12e22df8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/locale/multibyte.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: multibyte.c,v 1.8 2001/02/06 18:48:41 christos Exp $ */
/* $NetBSD: multibyte.c,v 1.9 2001/05/26 13:18:42 kleink Exp $ */
/*-
* Copyright (c) 1993
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ansi.c 8.1 (Berkeley) 6/27/93";
#else
__RCSID("$NetBSD: multibyte.c,v 1.8 2001/02/06 18:48:41 christos Exp $");
__RCSID("$NetBSD: multibyte.c,v 1.9 2001/05/26 13:18:42 kleink Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -379,10 +379,8 @@ mbsrtowcs(pwcs, s, n, ps)
(*s)++;
break;
case 0:
pwcs++;
cnt++;
(*s)++;
break;
goto bye;
default:
pwcs++;
cnt++;
@ -473,10 +471,10 @@ wcsrtombs(s, pwcs, n, ps)
if (n - cnt < siz)
return cnt;
memcpy(s, buf, siz);
cnt += siz;
s += siz;
if (!**pwcs)
break;
cnt += siz;
s += siz;
(*pwcs)++;
}
bye: