diff options
| author | Kenny Root <kroot@google.com> | 2011-02-12 07:13:44 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2011-02-14 09:32:56 -0800 |
| commit | f582340a6a48588aa50da17e1620e8f91b146941 (patch) | |
| tree | d30c0ffb648b7a43ff469f89f05850f5008482ec /libc/stdio/fgets.c | |
| parent | 72f9a5c374bf559e9c69a62c1d95304f913ef6b2 (diff) | |
| download | android_bionic-f582340a6a48588aa50da17e1620e8f91b146941.tar.gz android_bionic-f582340a6a48588aa50da17e1620e8f91b146941.tar.bz2 android_bionic-f582340a6a48588aa50da17e1620e8f91b146941.zip | |
Fix the handle locking in stdio
Fix the handle locking in stdio to use flockfile/funlockfile
internally when and where required. Macros in <stdio.h> are updated
to automatically call the underlying functions when the process is
threaded to obtain the necessary locking. A private mutex is added
to protect __sglue, the internal list of FILE handles, and another
to protect the one-time initialization. Some routines in libc that
use getc() change to use getc_unlocked() as they're either protected
by their own lock or aren't thread-safe routines anyway.
Based on OpenBSD change by guenther@openbsd.org
http://www.mail-archive.com/source-changes@cvs.openbsd.org/msg01015.html
Bug: 3446659
Change-Id: Ie82116e358c541718d6709ec45ca6796be5a007b
Diffstat (limited to 'libc/stdio/fgets.c')
| -rw-r--r-- | libc/stdio/fgets.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c index f26385d6a..311b7b290 100644 --- a/libc/stdio/fgets.c +++ b/libc/stdio/fgets.c @@ -51,6 +51,7 @@ fgets(char *buf, int n, FILE *fp) if (n <= 0) /* sanity check */ return (NULL); + FLOCKFILE(fp); _SET_ORIENTATION(fp, -1); s = buf; n--; /* leave space for NUL */ @@ -61,8 +62,10 @@ fgets(char *buf, int n, FILE *fp) if (fp->_r <= 0) { if (__srefill(fp)) { /* EOF/error: stop with partial or no line */ - if (s == buf) + if (s == buf) { + FUNLOCKFILE(fp); return (NULL); + } break; } } @@ -84,6 +87,7 @@ fgets(char *buf, int n, FILE *fp) fp->_p = t; (void)memcpy((void *)s, (void *)p, len); s[len] = '\0'; + FUNLOCKFILE(fp); return (buf); } fp->_r -= len; @@ -93,5 +97,6 @@ fgets(char *buf, int n, FILE *fp) n -= len; } *s = '\0'; + FUNLOCKFILE(fp); return (buf); } |