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

Lock and unlock the file once per call and use the unlocked version of

Browse Source 
ungetc() instead of having ungetc() recurse on the lock.
This commit is contained in:
Tim J. Robbins 2002-09-20 13:23:26 +00:00
parent 8f030a44b8
commit 9260341650
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libc/stdio/ungetwc.c
View File

@ -43,17 +43,21 @@ ungetwc(wint_t wc, FILE *fp)
mbstate_t mbs;
size_t len;
ORIENTLOCK(fp, 1);
FLOCKFILE(fp);
ORIENT(fp, 1);
if (wc == WEOF)
return (WEOF);
goto error;
memset(&mbs, 0, sizeof(mbs));
if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1)
return (WEOF);
goto error;
while (len-- != 0)
if (ungetc((unsigned char)buf[len], fp) == EOF)
return (WEOF);
if (__ungetc((unsigned char)buf[len], fp) == EOF)
goto error;
FUNLOCKFILE(fp);
return (wc);
error:
FUNLOCKFILE(fp);
return (WEOF);
}