diff options
Diffstat (limited to 'lib/libc/stdio/fgets.c')
-rw-r--r-- | lib/libc/stdio/fgets.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c index 434fc07..a1833d2 100644 --- a/lib/libc/stdio/fgets.c +++ b/lib/libc/stdio/fgets.c @@ -39,16 +39,13 @@ static char sccsid[] = "@(#)fgets.c 8.2 (Berkeley) 12/22/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: fgets.c,v 1.7 1997/02/22 15:01:53 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> #include <string.h> #include "local.h" -#ifdef _THREAD_SAFE -#include <pthread.h> -#include "pthread_private.h" -#endif +#include "libc_private.h" /* * Read at most n-1 characters from the given file. @@ -68,9 +65,7 @@ fgets(buf, n, fp) if (n <= 0) /* sanity check */ return (NULL); -#ifdef _THREAD_SAFE - _thread_flockfile(fp,__FILE__,__LINE__); -#endif + FLOCKFILE(fp); s = buf; n--; /* leave space for NUL */ while (n != 0) { @@ -81,9 +76,7 @@ fgets(buf, n, fp) if (__srefill(fp)) { /* EOF/error: stop with partial or no line */ if (s == buf) { -#ifdef _THREAD_SAFE - _thread_funlockfile(fp); -#endif + FUNLOCKFILE(fp); return (NULL); } break; @@ -107,9 +100,7 @@ fgets(buf, n, fp) fp->_p = t; (void)memcpy((void *)s, (void *)p, len); s[len] = 0; -#ifdef _THREAD_SAFE - _thread_funlockfile(fp); -#endif + FUNLOCKFILE(fp); return (buf); } fp->_r -= len; @@ -119,8 +110,6 @@ fgets(buf, n, fp) n -= len; } *s = 0; -#ifdef _THREAD_SAFE - _thread_funlockfile(fp); -#endif + FUNLOCKFILE(fp); return (buf); } |