From 5d17af3434641bcd4a57bdf669f0db43d7b204ee Mon Sep 17 00:00:00 2001 From: "Thomas E. Spanjaard" Date: Wed, 6 Dec 2006 16:33:29 +0000 Subject: [PATCH] Pending enlightenment, specify confstr(3) to conform to SUSv3 instead of POSIX 1003.2. --- lib/libc/gen/confstr.3 | 11 +++++++---- lib/libc/gen/confstr.c | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3 index 986a4cbd75..38ad2b39e2 100644 --- a/lib/libc/gen/confstr.3 +++ b/lib/libc/gen/confstr.3 @@ -31,9 +31,9 @@ .\" .\" @(#)confstr.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD: src/lib/libc/gen/confstr.3,v 1.5.2.5 2001/12/14 18:33:50 ru Exp $ -.\" $DragonFly: src/lib/libc/gen/confstr.3,v 1.4 2006/12/06 11:58:57 tgen Exp $ +.\" $DragonFly: src/lib/libc/gen/confstr.3,v 1.5 2006/12/06 16:33:29 tgen Exp $ .\" -.Dd December 5, 2006 +.Dd December 6, 2006 .Dt CONFSTR 3 .Os .Sh NAME @@ -123,8 +123,11 @@ argument is invalid. .El .Sh SEE ALSO .Xr sysctl 3 -.Rs -.St -p1003.2 +.Sh STANDARDS +The +.Fn confstr +function conforms to +.St -susv3 . .Sh HISTORY The .Fn confstr diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c index 9206da9c2c..b28506c0e2 100644 --- a/lib/libc/gen/confstr.c +++ b/lib/libc/gen/confstr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)confstr.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libc/gen/confstr.c,v 1.4 2006/12/06 11:58:57 tgen Exp $ + * $DragonFly: src/lib/libc/gen/confstr.c,v 1.5 2006/12/06 16:33:29 tgen Exp $ */ #include @@ -56,17 +56,17 @@ confstr(int name, char *buf, size_t len) mib[1] = USER_CS_PATH; if (sysctl(mib, 2, NULL, &tlen, NULL, 0) == -1) /* - * POSIX 1003.2 requires errors to return 0. + * SUSv3 requires errors to return 0. */ return (0); if (len != 0 && buf != NULL) { if ((p = malloc(tlen)) == NULL) - return (0); /* POSIX 1003.2 */ + return (0); /* SUSv3 */ if (sysctl(mib, 2, p, &tlen, NULL, 0) == -1) { sverrno = errno; free(p); errno = sverrno; - return (0); /* POSIX 1003.2 */ + return (0); /* SUSv3 */ } /* * POSIX 1003.2 requires partial return of -- 2.41.0