summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdio/getc.c
diff options
context:
space:
mode:
authord <d@openbsd.org>1998-11-20 11:18:22 +0000
committerd <d@openbsd.org>1998-11-20 11:18:22 +0000
commit92efb7350713770eeac379dc990eaecbee107aa1 (patch)
tree9e7a54e9f5f807b6269323fc5be9480298ad6de5 /lib/libc/stdio/getc.c
parentMove atomic_lock code from asm to C with inline asm; (diff)
downloadwireguard-openbsd-92efb7350713770eeac379dc990eaecbee107aa1.tar.xz
wireguard-openbsd-92efb7350713770eeac379dc990eaecbee107aa1.zip
Add thread-safety to libc, so that libc_r will build (on i386 at least).
All POSIX libc api now there (to P1003.1c/D10) (more md stuff is needed for other libc/arch/*) (setlogin is no longer a special syscall) Add -pthread option to gcc (that makes it use -lc_r and -D_POSIX_THREADS). Doc some re-entrant routines Add libc_r to intro(3) dig() uses some libc srcs and an extra -I was needed there. Add more md stuff to libc_r. Update includes for the pthreads api Update libc_r TODO
Diffstat (limited to 'lib/libc/stdio/getc.c')
-rw-r--r--lib/libc/stdio/getc.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index ff4a5168a3f..ce990968202 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -35,12 +35,24 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getc.c,v 1.2 1996/08/19 08:32:51 tholo Exp $";
+static char rcsid[] = "$OpenBSD: getc.c,v 1.3 1998/11/20 11:18:48 d Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
/*
+ * A subroutine version of the macro getc_unlocked.
+ */
+#undef getc_unlocked
+
+int
+getc_unlocked(fp)
+ FILE *fp;
+{
+ return (__sgetc(fp));
+}
+
+/*
* A subroutine version of the macro getc.
*/
#undef getc
@@ -49,5 +61,10 @@ int
getc(fp)
register FILE *fp;
{
- return (__sgetc(fp));
+ int c;
+
+ flockfile(fp);
+ c = __sgetc(fp);
+ funlockfile(fp);
+ return (c);
}