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

Lock the file once per call and use the unlocked fgetwc()/fputwc() variants.

Browse Source
This commit is contained in:
Tim J. Robbins 2002-09-20 13:25:40 +00:00
parent 9260341650
commit 7591ae56ae
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=103678
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libc/stdio/fgetws.c
View File

@ -41,20 +41,23 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
wchar_t *wsp; wchar_t *wsp;
wint_t wc; wint_t wc;
ORIENTLOCK(fp, 1); FLOCKFILE(fp);
ORIENT(fp, 1);
if (n <= 0) if (n <= 0) {
return (NULL); errno = EINVAL;
goto error;
}
wsp = ws; wsp = ws;
while (n-- > 1) { while (n-- > 1) {
/* XXX Inefficient */ /* XXX Inefficient */
if ((wc = fgetwc(fp)) == WEOF && errno == EILSEQ) if ((wc = __fgetwc(fp)) == WEOF && errno == EILSEQ)
return (NULL); goto error;
if (wc == WEOF) { if (wc == WEOF) {
if (wsp == ws) if (wsp == ws)
/* EOF/error, no characters read yet. */ /* EOF/error, no characters read yet. */
return (NULL); goto error;
break; break;
} }
*wsp++ = (wchar_t)wc; *wsp++ = (wchar_t)wc;
@ -62,6 +65,11 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
break; break;
} }
*wsp++ = L'\0'; *wsp++ = L'\0';
FUNLOCKFILE(fp);
return (ws); return (ws);
error:
FUNLOCKFILE(fp);
return (NULL);
} }

9
lib/libc/stdio/fputws.c
View File

@ -39,12 +39,15 @@ int
fputws(const wchar_t * __restrict ws, FILE * __restrict fp) fputws(const wchar_t * __restrict ws, FILE * __restrict fp)
{ {
ORIENTLOCK(fp, 1); FLOCKFILE(fp);
ORIENT(fp, 1);
/* XXX Inefficient */ /* XXX Inefficient */
while (*ws != '\0') while (*ws != '\0')
if (fputwc(*ws++, fp) == WEOF) if (__fputwc(*ws++, fp) == WEOF) {
FUNLOCKFILE(fp);
return (-1); return (-1);
}
FUNLOCKFILE(fp);
return (0); return (0);
} }