diff options
| author |   guenther <guenther@openbsd.org> | 2009-10-22 01:23:16 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2009-10-22 01:23:16 +0000 |
| commit | 7ff09c5c6c97039a5c7f7864c46007f47d652b03 (patch) | |
| tree | 85241012fd1c4ec9714f130877e15fb5088fd2d7 /lib/libc/stdio/fgets.c | |
| parent | Add delete example since it has come up several times. (diff) | |
| download | wireguard-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/fgets.c')
| -rw-r--r-- | lib/libc/stdio/fgets.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c index 66ba159509c..661ec0d3861 100644 --- a/lib/libc/stdio/fgets.c +++ b/lib/libc/stdio/fgets.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fgets.c,v 1.12 2009/10/21 16:04:23 guenther Exp $ */ +/* $OpenBSD: fgets.c,v 1.13 2009/10/22 01:23:16 guenther Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -54,7 +54,6 @@ fgets(char *buf, int n, FILE *fp) return (NULL); } - FLOCKFILE(fp); _SET_ORIENTATION(fp, -1); s = buf; n--; /* leave space for NUL */ @@ -65,10 +64,8 @@ fgets(char *buf, int n, FILE *fp) if (fp->_r <= 0) { if (__srefill(fp)) { /* EOF/error: stop with partial or no line */ - if (s == buf) { - FUNLOCKFILE(fp); + if (s == buf) return (NULL); - } break; } } @@ -90,7 +87,6 @@ fgets(char *buf, int n, FILE *fp) fp->_p = t; (void)memcpy((void *)s, (void *)p, len); s[len] = '\0'; - FUNLOCKFILE(fp); return (buf); } fp->_r -= len; @@ -100,6 +96,5 @@ fgets(char *buf, int n, FILE *fp) n -= len; } *s = '\0'; - FUNLOCKFILE(fp); return (buf); } |