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

PR 5170: don't fclose twice, or call ferror after fclose. 

required removing fcloses and/or moving them, nulling the pointers
like they should have been, and adding a terminating null byte and break
in one case (perhaps we never ran into those problems before).
cgetclose() already does a fclose and null of the pointer, so don't
duplicate it when we don't need to.
This commit is contained in:
tv 1998-03-18 20:29:27 +00:00
parent b637a998f4
commit 902d175a04
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libc/gen/getcap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: getcap.c,v 1.18 1998/03/02 23:39:49 thorpej Exp $ */
/* $NetBSD: getcap.c,v 1.19 1998/03/18 20:29:27 tv Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94";
#else
__RCSID("$NetBSD: getcap.c,v 1.18 1998/03/02 23:39:49 thorpej Exp $");
__RCSID("$NetBSD: getcap.c,v 1.19 1998/03/18 20:29:27 tv Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -623,10 +623,6 @@ cgetmatch(buf, name)
}
}
int
cgetfirst(buf, db_array)
char **buf, **db_array;
@ -681,11 +677,12 @@ cgetnext(bp, db_array)
} else {
line = fgetln(pfp, &len);
if (line == NULL && pfp) {
(void)fclose(pfp);
if (ferror(pfp)) {
(void)cgetclose();
return (-1);
} else {
(void)fclose(pfp);
pfp = NULL;
if (*++dbp == NULL) {
(void)cgetclose();
return (0);
@ -739,11 +736,14 @@ cgetnext(bp, db_array)
} else { /* name field extends beyond the line */
line = fgetln(pfp, &len);
if (line == NULL && pfp) {
(void)fclose(pfp);
if (ferror(pfp)) {
(void)cgetclose();
return (-1);
}
(void)fclose(pfp);
pfp = NULL;
*np = '\0';
break;
} else
line[len - 1] = '\0';
}