summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitrij Tejblum <dt@FreeBSD.org>1998-09-09 16:50:33 +0000
committerDmitrij Tejblum <dt@FreeBSD.org>1998-09-09 16:50:33 +0000
commitf0f066ec83de46a834851fa99cdf4edf399122c4 (patch)
treec412eb9f9cecae9eaf7600b1188b8b0507e7660d /lib
parentaddb18b16dbf08e79de69f7e88822c4dc60e5291 (diff)
Notes
Diffstat (limited to 'lib')
-rw-r--r--lib/libc_r/uthread/uthread_file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc_r/uthread/uthread_file.c b/lib/libc_r/uthread/uthread_file.c
index af2ed5aa652b..0fb52a97dcb2 100644
--- a/lib/libc_r/uthread/uthread_file.c
+++ b/lib/libc_r/uthread/uthread_file.c
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: uthread_file.c,v 1.4 1998/06/09 23:20:44 jb Exp $
+ * $Id: uthread_file.c,v 1.5 1998/09/07 21:55:01 alex Exp $
*
* POSIX stdio FILE locking functions. These assume that the locking
* is only required at FILE structure level, not at file descriptor
@@ -82,7 +82,7 @@ struct file_lock {
* structures. If there is a collision, a linear search of the
* dynamic list of locks linked to each static lock is perfomed.
*/
-#define file_idx(_p) ((((long) _p) >> sizeof(void *)) % NUM_HEADS)
+#define file_idx(_p) ((((u_long) _p) >> sizeof(void *)) % NUM_HEADS)
/*
* Global array of file locks. The first lock for each hash bucket is
@@ -122,7 +122,7 @@ find_lock(int idx, FILE *fp)
* Loop through the dynamic locks looking for the
* target file:
*/
- while (p != NULL && p->fp != fp && p->owner != NULL)
+ while (p != NULL && (p->fp != fp || p->owner == NULL))
/* Not this file, try the next: */
p = p->entry.le_next;
}