From owner-p4-projects@FreeBSD.ORG Thu Dec 8 09:55:51 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 544F716A422; Thu, 8 Dec 2005 09:55:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CE0D16A41F for ; Thu, 8 Dec 2005 09:55:51 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89B5943D69 for ; Thu, 8 Dec 2005 09:55:43 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB89thhL068874 for ; Thu, 8 Dec 2005 09:55:43 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB89thiv068871 for perforce@freebsd.org; Thu, 8 Dec 2005 09:55:43 GMT (envelope-from soc-bushman@freebsd.org) Date: Thu, 8 Dec 2005 09:55:43 GMT Message-Id: <200512080955.jB89thiv068871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 87883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Dec 2005 09:55:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=87883 Change 87883 by soc-bushman@soc-bushman_stinger on 2005/12/08 09:54:44 merging results Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/include/rpcsvc/yp_prot.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/uname.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/lio_listio.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigreturn.2#3 integrate Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/include/rpcsvc/yp_prot.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/rpcsvc/yp_prot.h,v 1.12 2004/05/27 11:34:21 tmm Exp $ + * $FreeBSD: src/include/rpcsvc/yp_prot.h,v 1.13 2005/12/06 02:01:06 peter Exp $ */ #ifndef _RPCSVC_YP_PROT_H_ @@ -148,7 +148,7 @@ }; struct ypmaplist { - char ypml_name[YPMAXMAP + 1]; + char *ypml_name; struct ypmaplist *ypml_next; }; ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getosreldate.3#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.2 2003/02/24 22:55:33 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.3 2005/12/03 05:11:07 ambrisko Exp $ .\" -.Dd January 30, 2003 +.Dd December 2, 2005 .Dt GETOSRELDATE 3 .Os .Sh NAME @@ -55,6 +55,15 @@ otherwise the value \-1 is returned and the global variable .Va errno is set to indicate the error. +.Sh ENVIRONMENT +.Bl -tag -width ".Ev OSVERSION" +.It Ev OSVERSION +If the environment variable +.Ev OSVERSION +is set, it will override the +.Fn getosreldate +return value. +.El .Sh EXAMPLES An example can be found in .Pa /usr/share/examples/FreeBSD_version . ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/uname.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)uname.3 8.1 (Berkeley) 1/4/94 -.\" $FreeBSD: src/lib/libc/gen/uname.3,v 1.12 2003/09/08 19:57:14 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/uname.3,v 1.13 2005/12/03 05:11:07 ambrisko Exp $ .\" -.Dd January 4, 1994 +.Dd December 2, 2005 .Dt UNAME 3 .Os .Sh NAME @@ -72,6 +72,33 @@ .El .Sh RETURN VALUES .Rv -std uname +.Sh ENVIRONMENT +.Bl -tag -width ".Ev UNAME_s" +.It Ev UNAME_s +If the environment variable +.Ev UNAME_s +is set, it will override the +.Va sysname +member. +.It Ev UNAME_r +If the environment variable +.Ev UNAME_r +is set, it will override the +.Va release +member. +.It Ev UNAME_v +If the environment variable +.Ev UNAME_v +is set, it will override the +.Va version +member. +.It Ev UNAME_m +If the environment variable +.Ev UNAME_m +is set, it will override the +.Va machine +member. +.El .Sh ERRORS The .Fn uname ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/lio_listio.2#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.2 2003/06/01 19:19:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.3 2005/12/03 09:00:43 ru Exp $ .\" .Dd January 12, 2003 .Dt LIO_LISTIO 2 @@ -37,7 +37,7 @@ .Ft int .Fo lio_listio .Fa "int mode" -.Fa "struct aiocb * const [] list" +.Fa "struct aiocb * const list[]" .Fa "int nent" .Fa "struct sigevent *sig" .Fc ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigreturn.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigreturn.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/sigreturn.2,v 1.16 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigreturn.2,v 1.17 2005/12/03 09:01:02 ru Exp $ .\" .Dd June 4, 1993 .Dt SIGRETURN 2 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In signal.h .Ft int -.Fn sigreturn "ucontext_t *scp" +.Fn sigreturn "const ucontext_t *scp" .Sh DESCRIPTION The .Fn sigreturn