 f582340a6a
			
		
	
	f582340a6a
	
	
	
		
			
			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
		
			
				
	
	
		
			101 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			101 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*	$OpenBSD: ftell.c,v 1.6 2005/08/08 08:05:36 espie Exp $ */
 | |
| /*-
 | |
|  * Copyright (c) 1990, 1993
 | |
|  *	The Regents of the University of California.  All rights reserved.
 | |
|  *
 | |
|  * This code is derived from software contributed to Berkeley by
 | |
|  * Chris Torek.
 | |
|  *
 | |
|  * Redistribution and use in source and binary forms, with or without
 | |
|  * modification, are permitted provided that the following conditions
 | |
|  * are met:
 | |
|  * 1. Redistributions of source code must retain the above copyright
 | |
|  *    notice, this list of conditions and the following disclaimer.
 | |
|  * 2. Redistributions in binary form must reproduce the above copyright
 | |
|  *    notice, this list of conditions and the following disclaimer in the
 | |
|  *    documentation and/or other materials provided with the distribution.
 | |
|  * 3. Neither the name of the University nor the names of its contributors
 | |
|  *    may be used to endorse or promote products derived from this software
 | |
|  *    without specific prior written permission.
 | |
|  *
 | |
|  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 | |
|  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | |
|  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 | |
|  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 | |
|  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | |
|  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 | |
|  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 | |
|  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 | |
|  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 | |
|  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 | |
|  * SUCH DAMAGE.
 | |
|  */
 | |
| 
 | |
| #include <stdio.h>
 | |
| #include <errno.h>
 | |
| #include "local.h"
 | |
| 
 | |
| /*
 | |
|  * ftello: return current offset.
 | |
|  */
 | |
| off_t
 | |
| ftello(FILE *fp)
 | |
| {
 | |
| 	fpos_t pos;
 | |
| 
 | |
| 	if (fp->_seek == NULL) {
 | |
| 		errno = ESPIPE;			/* historic practice */
 | |
| 		pos = -1;
 | |
|                 goto out;
 | |
| 	}
 | |
| 
 | |
| 	/*
 | |
| 	 * Find offset of underlying I/O object, then
 | |
| 	 * adjust for buffered bytes.
 | |
| 	 */
 | |
|         FLOCKFILE(fp);
 | |
| 	__sflush(fp);		/* may adjust seek offset on append stream */
 | |
| 	if (fp->_flags & __SOFF)
 | |
| 		pos = fp->_offset;
 | |
| 	else {
 | |
| 		pos = (*fp->_seek)(fp->_cookie, (fpos_t)0, SEEK_CUR);
 | |
| 		if (pos == -1)
 | |
| 			goto out;
 | |
| 	}
 | |
| 	if (fp->_flags & __SRD) {
 | |
| 		/*
 | |
| 		 * Reading.  Any unread characters (including
 | |
| 		 * those from ungetc) cause the position to be
 | |
| 		 * smaller than that in the underlying object.
 | |
| 		 */
 | |
| 		pos -= fp->_r;
 | |
| 		if (HASUB(fp))
 | |
| 			pos -= fp->_ur;
 | |
| 	} else if (fp->_flags & __SWR && fp->_p != NULL) {
 | |
| 		/*
 | |
| 		 * Writing.  Any buffered characters cause the
 | |
| 		 * position to be greater than that in the
 | |
| 		 * underlying object.
 | |
| 		 */
 | |
| 		pos += fp->_p - fp->_bf._base;
 | |
| 	}
 | |
| out:	FUNLOCKFILE(fp);
 | |
| 	return (pos);
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * ftell() returns a long and sizeof(off_t) != sizeof(long) on all arches
 | |
|  */
 | |
| #if defined(__alpha__) && defined(__indr_reference)
 | |
| __indr_reference(ftello, ftell);
 | |
| #else
 | |
| long
 | |
| ftell(FILE *fp)
 | |
| {
 | |
| 	long pos;
 | |
| 
 | |
| 	pos = (long)ftello(fp);
 | |
| 	return(pos);
 | |
| }
 | |
| #endif
 |