From 9962e7fd037872c423544f61cba1c901b045363a Mon Sep 17 00:00:00 2001 From: guenther Date: Wed, 21 Oct 2009 16:04:23 +0000 Subject: Fix the handle locking in stdio to use flockfile/funlockfile internally when and where required. Macros in 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. ok kurt@, earlier version tested by sthen@ and jj@ --- lib/libc/stdio/gets.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/libc/stdio/gets.c') diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c index 004eb99f487..30cd712e035 100644 --- a/lib/libc/stdio/gets.c +++ b/lib/libc/stdio/gets.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gets.c,v 1.9 2005/08/08 08:05:36 espie Exp $ */ +/* $OpenBSD: gets.c,v 1.10 2009/10/21 16:04:23 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -32,6 +32,7 @@ */ #include +#include "local.h" __warn_references(gets, "warning: gets() is very unsafe; consider using fgets()"); @@ -42,14 +43,17 @@ gets(char *buf) int c; char *s; - for (s = buf; (c = getchar()) != '\n';) + FLOCKFILE(stdin); + for (s = buf; (c = getchar_unlocked()) != '\n';) if (c == EOF) - if (s == buf) + if (s == buf) { + FUNLOCKFILE(stdin); return (NULL); - else + } else break; else *s++ = c; *s = '\0'; + FUNLOCKFILE(stdin); return (buf); } -- cgit v1.2.3-59-g8ed1b