From 0ff63017b40dda207b2aadc9881e0c93e7fd2753 Mon Sep 17 00:00:00 2001 From: jb Date: Sat, 11 Apr 1998 07:40:47 +0000 Subject: Add FILE locking stubs for libc. Change the FILE locking to support kernel threads when linked with libpthread (which you haven't see yet). This requires that libc become thread-safe and thread-aware, testing __isthreaded before attempting to do lock/unlock calls. The impact on non-threaded programs is minor. This change works with libc_r, so it's the best compromise. --- lib/libc/stdio/fscanf.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib/libc/stdio/fscanf.c') diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c index 8513f80..a8b10a4 100644 --- a/lib/libc/stdio/fscanf.c +++ b/lib/libc/stdio/fscanf.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)fscanf.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: fscanf.c,v 1.5 1997/02/22 15:02:04 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -48,10 +48,7 @@ static const char rcsid[] = #else #include #endif -#ifdef _THREAD_SAFE -#include -#include "pthread_private.h" -#endif +#include "libc_private.h" #if __STDC__ int @@ -72,13 +69,9 @@ fscanf(fp, fmt, va_alist) va_start(ap); #endif -#ifdef _THREAD_SAFE - _thread_flockfile(fp,__FILE__,__LINE__); -#endif + FLOCKFILE(fp); ret = __svfscanf(fp, fmt, ap); va_end(ap); -#ifdef _THREAD_SAFE - _thread_funlockfile(fp); -#endif + FUNLOCKFILE(fp); return (ret); } -- cgit v1.1