Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Need to wrap stdio stream locking around the function body. On the bright

Browse Source 
side, getchar_unlocked() can now be used instead of getchar().
This commit is contained in:
kleink 1998-11-20 14:49:19 +00:00
parent 71f3223468
commit 8e8595b01c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/libc/stdio/gets.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gets.c,v 1.10 1998/02/03 18:41:17 perry Exp $ */ /* $NetBSD: gets.c,v 1.11 1998/11/20 14:49:19 kleink Exp $ */
/*- /*-
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
@ -41,11 +41,12 @@
#if 0 #if 0
static char sccsid[] = "@(#)gets.c 8.1 (Berkeley) 6/4/93"; static char sccsid[] = "@(#)gets.c 8.1 (Berkeley) 6/4/93";
#else #else
__RCSID("$NetBSD: gets.c,v 1.10 1998/02/03 18:41:17 perry Exp $"); __RCSID("$NetBSD: gets.c,v 1.11 1998/11/20 14:49:19 kleink Exp $");
#endif #endif
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <stdio.h> #include <stdio.h>
#include "reentrant.h"
__warn_references(gets, "warning: this program uses gets(), which is unsafe.") __warn_references(gets, "warning: this program uses gets(), which is unsafe.")
@ -56,14 +57,20 @@ gets(buf)
int c; int c;
char *s; char *s;
for (s = buf; (c = getchar()) != '\n';) FLOCKFILE(stdin);
if (c == EOF) for (s = buf; (c = getchar_unlocked()) != '\n'; ) {
if (s == buf) if (c == EOF) {
if (s == buf) {
FUNLOCKFILE(stdin);
return (NULL); return (NULL);
else } else {
break; break;
else }
} else {
*s++ = c; *s++ = c;
}
}
*s = 0; *s = 0;
FUNLOCKFILE(stdin);
return (buf); return (buf);
} }