summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdio/freopen.c
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2009-10-22 01:23:16 +0000
committerguenther <guenther@openbsd.org>2009-10-22 01:23:16 +0000
commit7ff09c5c6c97039a5c7f7864c46007f47d652b03 (patch)
tree85241012fd1c4ec9714f130877e15fb5088fd2d7 /lib/libc/stdio/freopen.c
parentAdd delete example since it has come up several times. (diff)
downloadwireguard-openbsd-7ff09c5c6c97039a5c7f7864c46007f47d652b03.tar.xz
wireguard-openbsd-7ff09c5c6c97039a5c7f7864c46007f47d652b03.zip
Back out previous commit, as it caused too much growth for the install
media to fit
Diffstat (limited to 'lib/libc/stdio/freopen.c')
-rw-r--r--lib/libc/stdio/freopen.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
index b5dbc3096d4..7b4b480619d 100644
--- a/lib/libc/stdio/freopen.c
+++ b/lib/libc/stdio/freopen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: freopen.c,v 1.11 2009/10/21 16:04:23 guenther Exp $ */
+/* $OpenBSD: freopen.c,v 1.12 2009/10/22 01:23:16 guenther Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -60,8 +60,6 @@ freopen(const char *file, const char *mode, FILE *fp)
if (!__sdidinit)
__sinit();
- FLOCKFILE(fp);
-
/*
* There are actually programs that depend on being able to "freopen"
* descriptors that weren't originally open. Keep this from breaking.
@@ -123,7 +121,6 @@ freopen(const char *file, const char *mode, FILE *fp)
if (f < 0) { /* did not get it after all */
fp->_flags = 0; /* set it free */
- FUNLOCKFILE(fp);
errno = sverrno; /* restore in case _close clobbered */
return (NULL);
}
@@ -143,7 +140,6 @@ freopen(const char *file, const char *mode, FILE *fp)
/* _file is only a short */
if (f > SHRT_MAX) {
fp->_flags = 0; /* set it free */
- FUNLOCKFILE(fp);
errno = EMFILE;
return (NULL);
}
@@ -166,6 +162,5 @@ freopen(const char *file, const char *mode, FILE *fp)
*/
if (oflags & O_APPEND)
(void) __sseek((void *)fp, (fpos_t)0, SEEK_END);
- FUNLOCKFILE(fp);
return (fp);
}