From ff2a681918f0536be0bd28669d15a78b8d1ed571 Mon Sep 17 00:00:00 2001 From: tjr Date: Fri, 20 Sep 2002 13:23:26 +0000 Subject: Lock and unlock the file once per call and use the unlocked version of ungetc() instead of having ungetc() recurse on the lock. --- lib/libc/stdio/ungetwc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'lib/libc') diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c index 0783fa9..7602718 100644 --- a/lib/libc/stdio/ungetwc.c +++ b/lib/libc/stdio/ungetwc.c @@ -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); } -- cgit v1.1