diff options
| author |   guenther <guenther@openbsd.org> | 2009-10-21 16:04:23 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2009-10-21 16:04:23 +0000 |
| commit | 9962e7fd037872c423544f61cba1c901b045363a (patch) | |
| tree | ce799ea09983ba455c4a97b46913cf18ffa2a841 /lib/libc/gen/getttyent.c | |
| parent | "usage:" is lowercase; spacing. (diff) | |
| download | wireguard-openbsd-9962e7fd037872c423544f61cba1c901b045363a.tar.xz wireguard-openbsd-9962e7fd037872c423544f61cba1c901b045363a.zip | |
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.
ok kurt@, earlier version tested by sthen@ and jj@
Diffstat (limited to 'lib/libc/gen/getttyent.c')
| -rw-r--r-- | lib/libc/gen/getttyent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c index 38b57feee91..081b56f6665 100644 --- a/lib/libc/gen/getttyent.c +++ b/lib/libc/gen/getttyent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getttyent.c,v 1.9 2005/08/08 08:05:34 espie Exp $ */ +/* $OpenBSD: getttyent.c,v 1.10 2009/10/21 16:04:23 guenther Exp $ */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -68,7 +68,7 @@ getttyent(void) return (NULL); /* skip lines that are too big */ if (!strchr(p, '\n')) { - while ((c = getc(tf)) != '\n' && c != EOF) + while ((c = getc_unlocked(tf)) != '\n' && c != EOF) ; continue; } |