mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-04 23:35:36 -08:00
Code

check confstr() return value. Due to the braindead return value

Browse Source 
specified by POSIX we have to clear errno before; also check for -1 to
remain compatible. ok millert@
This commit is contained in:
otto 2006-12-04 15:05:19 +00:00
parent efda54e469
commit 4598616492
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/getconf/getconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: getconf.c,v 1.9 2003/07/10 00:06:51 david Exp $ */
/* $OpenBSD: getconf.c,v 1.10 2006/12/04 15:05:19 otto Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#ifndef lint
static char rcsid[] = "$OpenBSD: getconf.c,v 1.9 2003/07/10 00:06:51 david Exp $";
static char rcsid[] = "$OpenBSD: getconf.c,v 1.10 2006/12/04 15:05:19 otto Exp $";
#endif /* not lint */
#include <stdio.h>
@ -188,8 +188,15 @@ main(int argc, char *argv[])
break;
case CONFSTR:
errno = 0;
slen = confstr (cp->value, (char *) 0, (size_t) 0);
if (slen == 0 || slen == (size_t)-1) {
if (errno)
err(1, "%s", cp->value);
else
errx(1, "%s", cp->value);
}
if ((sval = malloc(slen)) == NULL)
err(1, NULL);