d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error in wcstombs: byte count not counted

Browse Source 
Remove unneded casts in sgetrune/sputrune
Submitted by: wcstombs fix by Mihoko Tanaka <m_tonaka@pa.yokogawa.co.jp>
This commit is contained in:
Andrey A. Chernov 1996-04-18 07:01:46 +00:00
parent 39413a2c2a
commit c0ea8ed12f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=15286
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/locale/ansi.c
View File

@ -53,7 +53,7 @@ mblen(s, n)
if (s == 0 || *s == 0)
return (0); /* No support for state dependent encodings. */
if (sgetrune(s, (int)n, &e) == _INVALID_RUNE)
if (sgetrune(s, n, &e) == _INVALID_RUNE)
return (s - e);
return (e - s);
}
@ -70,7 +70,7 @@ mbtowc(pwc, s, n)
if (s == 0 || *s == 0)
return (0); /* No support for state dependent encodings. */
if ((r = sgetrune(s, (int)n, &e)) == _INVALID_RUNE)
if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE)
return (s - e);
if (pwc)
*pwc = r;
@ -137,11 +137,12 @@ wcstombs(s, pwcs, n)
*s = 0;
break;
}
if (!sputrune(*pwcs++, s, (int)n, &e))
if (!sputrune(*pwcs++, s, n, &e))
return (-1); /* encoding error */
if (!e) /* too long */
return (cnt);
cnt += e - s;
n -= e - s;
s = e;
}
return (cnt);