From owner-p4-projects Thu Aug 15 14:43:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D50037B416; Thu, 15 Aug 2002 14:42:12 -0700 (PDT) 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 1C98337B4FD for ; Thu, 15 Aug 2002 14:42:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59A5643E6E for ; Thu, 15 Aug 2002 14:42:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FLg7JU022296 for ; Thu, 15 Aug 2002 14:42:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FLg5ue022293 for perforce@freebsd.org; Thu, 15 Aug 2002 14:42:05 -0700 (PDT) Date: Thu, 15 Aug 2002 14:42:05 -0700 (PDT) Message-Id: <200208152142.g7FLg5ue022293@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16064 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16064 Change 16064 by rwatson@rwatson_tislabs on 2002/08/15 14:41:25 Integ trustedbsd_mac from trustedbsd base. Trickle back fo_read/fo_write/.../vn_rdwr credential changes, network stack MAC changes, et al. Affected files ... .. //depot/projects/trustedbsd/mac/UPDATING#14 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc#18 integrate .. //depot/projects/trustedbsd/mac/etc/rc.network#12 integrate .. //depot/projects/trustedbsd/mac/include/arpa/inet.h#6 integrate .. //depot/projects/trustedbsd/mac/include/inttypes.h#5 integrate .. //depot/projects/trustedbsd/mac/include/search.h#3 integrate .. //depot/projects/trustedbsd/mac/include/stdio.h#6 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#10 integrate .. //depot/projects/trustedbsd/mac/include/time.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_ntop.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_pton.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/setbuf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/setvbuf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/snprintf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/sprintf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsnprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoimax.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtol.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtol.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoll.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoq.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoul.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoul.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoull.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoumax.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtouq.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/tdelete.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcat.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcat.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcpy.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcpy.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strncat.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strncpy.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strxfrm.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/cy.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/zero_copy.9#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_extend.c#2 delete .. //depot/projects/trustedbsd/mac/sys/cam/cam_extend.h#2 delete .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#45 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbvar.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wavelan_ieee.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi_pccard.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wivar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NEWCARD#8 delete .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#245 integrate .. //depot/projects/trustedbsd/mac/sys/kern/link_aout.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_debug.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/vm_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#99 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#81 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#67 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tlb.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/file.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#153 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#116 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#43 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#48 integrate .. //depot/projects/trustedbsd/mac/tools/regression/README#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/README#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/msgtest.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/README#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/semtest.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/README#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/shmtest.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/find/find.1#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/find/option.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/stat.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/UPDATING#14 (text+ko) ==== @@ -22,6 +22,11 @@ integrity. Re-enabling write caching can substantially improve performance. +20020815: + A "bug" in gcc(1) that was hiding warning in system headers was + fixed. It's probably time to add -DNO_WERROR to your make line + again. + 20020729: COPY is being deprecated. The 20010530 change was reverted, as it causes far more pain than was expected, and to always compare @@ -1057,4 +1062,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.214 2002/07/29 08:51:03 ru Exp $ +$FreeBSD: src/UPDATING,v 1.215 2002/08/15 08:51:24 ru Exp $ ==== //depot/projects/trustedbsd/mac/bin/test/test.c#9 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.50 2002/07/27 22:53:44 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.51 2002/08/15 14:53:20 maxim Exp $"); #include #include @@ -161,6 +161,7 @@ }; struct t_op const *t_wp_op; +int nargc; char **t_wp; static int aexpr(enum token); @@ -182,23 +183,8 @@ int main(int argc, char **argv) { - int i, res; + int res; char *p; - char **nargv; - - /* - * XXX copy the whole contents of argv to a newly allocated - * space with two extra cells filled with NULL's - this source - * code totally depends on their presence. - */ - if ((nargv = (char **)malloc((argc + 2) * sizeof(char *))) == NULL) - error("Out of space"); - - for (i = 0; i < argc; i++) - nargv[i] = argv[i]; - - nargv[i] = nargv[i + 1] = NULL; - argv = nargv; if ((p = rindex(argv[0], '/')) == NULL) p = argv[0]; @@ -210,15 +196,19 @@ argv[argc] = NULL; } + /* no expression => false */ + if (--argc <= 0) + return 1; + #ifndef SHELL (void)setlocale(LC_CTYPE, ""); #endif + nargc = argc; t_wp = &argv[1]; res = !oexpr(t_lex(*t_wp)); - if (*t_wp != NULL && *++t_wp != NULL) + if (--nargc > 0) syntax(*t_wp, "unexpected operator"); - free(nargv); return res; } @@ -239,9 +229,11 @@ int res; res = aexpr(n); - if (t_lex(*++t_wp) == BOR) - return oexpr(t_lex(*++t_wp)) || res; + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) == BOR) + return oexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) || + res; t_wp--; + nargc++; return res; } @@ -251,9 +243,11 @@ int res; res = nexpr(n); - if (t_lex(*++t_wp) == BAND) - return aexpr(t_lex(*++t_wp)) && res; + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) == BAND) + return aexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) && + res; t_wp--; + nargc++; return res; } @@ -261,7 +255,7 @@ nexpr(enum token n) { if (n == UNOT) - return !nexpr(t_lex(*++t_wp)); + return !nexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)); return primary(n); } @@ -274,30 +268,32 @@ if (n == EOI) return 0; /* missing expression */ if (n == LPAREN) { - if ((nn = t_lex(*++t_wp)) == RPAREN) + if ((nn = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) == + RPAREN) return 0; /* missing expression */ res = oexpr(nn); - if (t_lex(*++t_wp) != RPAREN) + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) != RPAREN) syntax(NULL, "closing paren expected"); return res; } if (t_wp_op && t_wp_op->op_type == UNOP) { /* unary expression */ - if (*++t_wp == NULL) + if (--nargc == 0) syntax(t_wp_op->op_text, "argument expected"); switch (n) { case STREZ: - return strlen(*t_wp) == 0; + return strlen(*++t_wp) == 0; case STRNZ: - return strlen(*t_wp) != 0; + return strlen(*++t_wp) != 0; case FILTT: - return isatty(getn(*t_wp)); + return isatty(getn(*++t_wp)); default: - return filstat(*t_wp, n); + return filstat(*++t_wp, n); } } - if (t_lex(t_wp[1]), t_wp_op && t_wp_op->op_type == BINOP) { + if (t_lex(nargc > 0 ? t_wp[1] : NULL), t_wp_op && t_wp_op->op_type == + BINOP) { return binop(); } @@ -311,10 +307,10 @@ struct t_op const *op; opnd1 = *t_wp; - (void) t_lex(*++t_wp); + (void) t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL); op = t_wp_op; - if ((opnd2 = *++t_wp) == NULL) + if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL) syntax(op->op_text, "argument expected"); switch (op->op_num) { @@ -415,7 +411,7 @@ while (op->op_text) { if (strcmp(s, op->op_text) == 0) { if ((op->op_type == UNOP && isoperand()) || - (op->op_num == LPAREN && *(t_wp+1) == 0)) + (op->op_num == LPAREN && nargc == 1)) break; t_wp_op = op; return op->op_num; @@ -433,10 +429,12 @@ char *s; char *t; - if ((s = *(t_wp+1)) == 0) + if (nargc == 1) return 1; - if ((t = *(t_wp+2)) == 0) + if (nargc == 2) return 0; + s = *(t_wp + 1); + t = *(t_wp + 2); while (op->op_text) { if (strcmp(s, op->op_text) == 0) return op->op_type == BINOP && ==== //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#6 (text+ko) ==== @@ -19,6 +19,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc/c-lex.c,v 1.2 2002/08/15 08:45:49 ru Exp $ */ + #include "config.h" #include "system.h" @@ -315,7 +317,11 @@ } update_header_times (new_map->to_file); +#ifndef FREEBSD_NATIVE in_system_header = new_map->sysp != 0; +#else /* FREEBSD_NATIVE */ + in_system_header = 0; +#endif /* FREEBSD_NATIVE */ input_filename = new_map->to_file; lineno = to_line; map = new_map; ==== //depot/projects/trustedbsd/mac/etc/rc#18 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.316 2002/08/14 05:58:44 gordon Exp $ +# $FreeBSD: src/etc/rc,v 1.317 2002/08/15 03:24:47 gordon Exp $ # # System startup script run by init on autoboot @@ -165,7 +165,6 @@ chkdepend amd amd_enable rpcbind rpcbind_enable chkdepend amd amd_enable NFS nfs_client_enable chkdepend NFS nfs_server_enable rpcbind rpcbind_enable -chkdepend NFS nfs_server_enable rpcbind rpcbind_enable chkdepend NIS nis_server_enable rpcbind rpcbind_enable chkdepend NIS nis_client_enable rpcbind rpcbind_enable ==== //depot/projects/trustedbsd/mac/etc/rc.network#12 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.network,v 1.135 2002/08/14 05:44:29 gordon Exp $ +# $FreeBSD: src/etc/rc.network,v 1.136 2002/08/15 03:29:19 gordon Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -694,7 +694,7 @@ fi ;; *) - case ${single_mountd_enable} in + case ${mountd_enable} in [Yy][Ee][Ss]) if [ -r /etc/exports ]; then echo -n ' mountd' ==== //depot/projects/trustedbsd/mac/include/arpa/inet.h#6 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.23 2002/08/14 20:40:35 robert Exp $ */ #ifndef _ARPA_INET_H_ @@ -139,8 +139,9 @@ in_addr_t inet_addr(const char *); char *inet_ntoa(struct in_addr); -const char *inet_ntop(int, const void *, char *, socklen_t); -int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *__restrict, char *__restrict, + socklen_t); +int inet_pton(int, const char *__restrict, void *__restrict); #if __BSD_VISIBLE int ascii2addr(int, const char *, void *); ==== //depot/projects/trustedbsd/mac/include/inttypes.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/inttypes.h,v 1.4 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.5 2002/08/15 09:25:03 robert Exp $ */ #ifndef _INTTYPES_H_ @@ -48,9 +48,9 @@ intmax_t imaxabs(intmax_t) __pure2; imaxdiv_t imaxdiv(intmax_t, intmax_t) __pure2; +intmax_t strtoimax(const char *__restrict, char **__restrict, int); +uintmax_t strtoumax(const char *__restrict, char **__restrict, int); /* XXX: The following functions are missing the restrict type qualifier. */ -intmax_t strtoimax(const char *, char **, int); -uintmax_t strtoumax(const char *, char **, int); intmax_t wcstoimax(const wchar_t *, wchar_t **, int); uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); __END_DECLS ==== //depot/projects/trustedbsd/mac/include/search.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ */ -/* $FreeBSD: src/include/search.h,v 1.4 2002/03/23 17:24:53 imp Exp $ */ +/* $FreeBSD: src/include/search.h,v 1.5 2002/08/14 21:16:41 robert Exp $ */ /* * Written by J.T. Conklin @@ -44,7 +44,8 @@ int hcreate(size_t); void hdestroy(void); ENTRY *hsearch(ENTRY, ACTION); -void *tdelete(const void *, void **, int (*)(const void *, const void *)); +void *tdelete(const void *__restrict, void **__restrict, + int (*)(const void *, const void *)); void *tfind(const void *, void **, int (*)(const void *, const void *)); void *tsearch(const void *, void **, int (*)(const void *, const void *)); void twalk(const void *, void (*)(const void *, VISIT, int)); ==== //depot/projects/trustedbsd/mac/include/stdio.h#6 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.41 2002/07/15 19:38:45 wollman Exp $ + * $FreeBSD: src/include/stdio.h,v 1.44 2002/08/15 10:28:51 robert Exp $ */ #ifndef _STDIO_H_ @@ -221,7 +221,7 @@ int fgetpos(FILE *, fpos_t *); char *fgets(char *, int, FILE *); FILE *fopen(const char *, const char *); -int fprintf(FILE *, const char *, ...); +int fprintf(FILE *__restrict, const char *__restrict, ...); int fputc(int, FILE *); int fputs(const char *, FILE *); size_t fread(void *, size_t, size_t, FILE *); @@ -235,7 +235,7 @@ int getchar(void); char *gets(char *); void perror(const char *); -int printf(const char *, ...); +int printf(const char *__restrict, ...); int putc(int, FILE *); int putchar(int); int puts(const char *); @@ -243,21 +243,24 @@ int rename(const char *, const char *); void rewind(FILE *); int scanf(const char *, ...); -void setbuf(FILE *, char *); -int setvbuf(FILE *, char *, int, size_t); -int sprintf(char *, const char *, ...); +void setbuf(FILE *__restrict, char *__restrict); +int setvbuf(FILE *__restrict, char *__restrict, int, size_t); +int sprintf(char *__restrict, const char *__restrict, ...); int sscanf(const char *, const char *, ...); FILE *tmpfile(void); char *tmpnam(char *); int ungetc(int, FILE *); -int vfprintf(FILE *, const char *, _BSD_VA_LIST_); -int vprintf(const char *, _BSD_VA_LIST_); -int vsprintf(char *, const char *, _BSD_VA_LIST_); +int vfprintf(FILE *__restrict, const char *__restrict, + _BSD_VA_LIST_); +int vprintf(const char *__restrict, _BSD_VA_LIST_); +int vsprintf(char *__restrict, const char *__restrict, + _BSD_VA_LIST_); #if __ISO_C_VISIBLE >= 1999 -int snprintf(char *, size_t, const char *, ...) __printflike(3, 4); -int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_) - __printflike(3, 0); +int snprintf(char *__restrict, size_t, const char *__restrict, + ...) __printflike(3, 4); +int vsnprintf(char *__restrict, size_t, const char *__restrict, + _BSD_VA_LIST_) __printflike(3, 0); #endif /* ==== //depot/projects/trustedbsd/mac/include/stdlib.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.37 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.38 2002/08/15 09:25:03 robert Exp $ */ #ifndef _STDLIB_H_ @@ -114,10 +114,10 @@ int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char *, char **); -long strtol(const char *, char **, int); +double strtod(const char *__restrict, char **__restrict); +long strtol(const char *__restrict, char **__restrict, int); unsigned long - strtoul(const char *, char **, int); + strtoul(const char *__restrict, char **__restrict, int); int system(const char *); int mblen(const char *, size_t); @@ -198,13 +198,13 @@ #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ long long - strtoll(const char *, char **, int); + strtoll(const char *__restrict, char **__restrict, int); #endif __int64_t strtoq(const char *, char **, int); #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ unsigned long long - strtoull(const char *, char **, int); + strtoull(const char *__restrict, char **__restrict, int); #endif __uint64_t strtouq(const char *, char **, int); ==== //depot/projects/trustedbsd/mac/include/time.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.25 2002/06/27 20:18:45 wollman Exp $ + * $FreeBSD: src/include/time.h,v 1.27 2002/08/14 23:20:48 robert Exp $ */ #ifndef _TIME_H_ @@ -121,7 +121,8 @@ struct tm *gmtime(const time_t *); struct tm *localtime(const time_t *); time_t mktime(struct tm *); -size_t strftime(char *, size_t, const char *, const struct tm *); +size_t strftime(char *__restrict, size_t, const char *__restrict, + const struct tm *__restrict); time_t time(time_t *); #if __POSIX_VISIBLE @@ -143,7 +144,8 @@ #endif #if __XSI_VISIBLE -char *strptime(const char *, const char *, struct tm *); +char *strptime(const char *__restrict, const char *__restrict, + struct tm *__restrict); #endif #if __BSD_VISIBLE ==== //depot/projects/trustedbsd/mac/lib/libc/i386/gen/makecontext.c#2 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.1 2002/01/10 02:40:59 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.2 2002/08/15 11:58:24 robert Exp $"); #include #include #include #include +#include #include #include ==== //depot/projects/trustedbsd/mac/lib/libc/net/inet.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.22 2001/12/01 03:43:01 mike Exp $ +.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.24 2002/08/15 20:33:44 robert Exp $ .\" .Dd June 17, 1996 .Dt INET 3 @@ -62,9 +62,14 @@ .Ft char * .Fn inet_ntoa "struct in_addr in" .Ft const char * -.Fn inet_ntop "int af" "const void *src" "char *dst" "socklen_t size" +.Fo inet_ntop +.Fa "int af" +.Fa "const void *restrict src" +.Fa "char *restrict dst" +.Fa "socklen_t size" +.Fc .Ft int -.Fn inet_pton "int af" "const char *src" "void *dst" +.Fn inet_pton "int af" "const char *restrict src" "void *restrict dst" .Ft struct in_addr .Fn inet_makeaddr "in_addr_t net" "in_addr_t lna" .Ft in_addr_t ==== //depot/projects/trustedbsd/mac/lib/libc/net/inet_ntop.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.9 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); #include #include @@ -49,11 +49,8 @@ * Paul Vixie, 1996. */ const char * -inet_ntop(af, src, dst, size) - int af; - const void *src; - char *dst; - socklen_t size; +inet_ntop(int af, const void *__restrict src, char *__restrict dst, + socklen_t size) { switch (af) { case AF_INET: @@ -79,10 +76,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop4(src, dst, size) - const u_char *src; - char *dst; - socklen_t size; +inet_ntop4(const u_char *src, char *dst, socklen_t size) { static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; @@ -102,10 +96,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop6(src, dst, size) - const u_char *src; - char *dst; - socklen_t size; +inet_ntop6(const u_char *src, char *dst, socklen_t size) { /* * Note that int32_t and int16_t need only be "at least" large enough ==== //depot/projects/trustedbsd/mac/lib/libc/net/inet_pton.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.9 2002/04/19 04:46:20 suz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); #include #include @@ -48,10 +48,7 @@ * Paul Vixie, 1996. */ int -inet_pton(af, src, dst) - int af; - const char *src; - void *dst; +inet_pton(int af, const char *__restrict src, void *__restrict dst) { switch (af) { case AF_INET: @@ -76,9 +73,7 @@ * Paul Vixie, 1996. */ static int -inet_pton4(src, dst) - const char *src; - u_char *dst; +inet_pton4(const char *src, u_char *dst) { static const char digits[] = "0123456789"; int saw_digit, octets, ch; @@ -130,9 +125,7 @@ * Paul Vixie, 1996. */ static int -inet_pton6(src, dst) - const char *src; - u_char *dst; +inet_pton6(const char *src, u_char *dst) { static const char xdigits_l[] = "0123456789abcdef", xdigits_u[] = "0123456789ABCDEF"; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/fprintf.c#4 (text+ko) ==== @@ -38,13 +38,13 @@ static char sccsid[] = "@(#)fprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.8 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.9 2002/08/15 09:47:10 robert Exp $"); #include #include int -fprintf(FILE *fp, const char *fmt, ...) +fprintf(FILE *__restrict fp, const char *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.3#9 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.44 2002/08/11 13:05:26 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.46 2002/08/15 10:28:51 robert Exp $ .\" .Dd November 8, 2001 .Dt PRINTF 3 @@ -48,24 +48,24 @@ .Sh SYNOPSIS .In stdio.h .Ft int -.Fn printf "const char *format" ... +.Fn printf "const char *restrict format" ... .Ft int -.Fn fprintf "FILE *stream" "const char *format" ... +.Fn fprintf "FILE *restrict stream" "const char *restrict format" ... .Ft int -.Fn sprintf "char *str" "const char *format" ... +.Fn sprintf "char *restrict str" "const char *restrict format" ... .Ft int -.Fn snprintf "char *str" "size_t size" "const char *format" ... +.Fn snprintf "char *restrict str" "size_t size" "const char *restrict format" ... .Ft int .Fn asprintf "char **ret" "const char *format" ... .In stdarg.h .Ft int -.Fn vprintf "const char *format" "va_list ap" +.Fn vprintf "const char *restrict format" "va_list ap" .Ft int -.Fn vfprintf "FILE *stream" "const char *format" "va_list ap" +.Fn vfprintf "FILE *restrict stream" "const char *restrict format" "va_list ap" .Ft int -.Fn vsprintf "char *str" "const char *format" "va_list ap" +.Fn vsprintf "char *restrict str" "const char *restrict format" "va_list ap" .Ft int -.Fn vsnprintf "char *str" "size_t size" "const char *format" "va_list ap" +.Fn vsnprintf "char *restrict str" "size_t size" "const char *restrict format" "va_list ap" .Ft int .Fn vasprintf "char **ret" "const char *format" "va_list ap" .Sh DESCRIPTION ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.c#4 (text+ko) ==== @@ -38,13 +38,13 @@ static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.8 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.9 2002/08/15 09:47:10 robert Exp $"); #include #include int -printf(char const *fmt, ...) +printf(char const *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/setbuf.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setbuf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.10 2001/10/01 16:08:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.11 2002/08/14 23:45:42 robert Exp $ .\" .Dd June 4, 1993 .Dt SETBUF 3 @@ -50,13 +50,13 @@ .Sh SYNOPSIS .In stdio.h .Ft void -.Fn setbuf "FILE *stream" "char *buf" +.Fn setbuf "FILE *restrict stream" "char *restrict buf" .Ft void .Fn setbuffer "FILE *stream" "char *buf" "int size" .Ft int .Fn setlinebuf "FILE *stream" .Ft int -.Fn setvbuf "FILE *stream" "char *buf" "int mode" "size_t size" +.Fn setvbuf "FILE *restrict stream" "char *restrict buf" "int mode" "size_t size" .Sh DESCRIPTION The three types of buffering available are unbuffered, block buffered, and line buffered. ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/setbuf.c#3 (text+ko) ==== @@ -38,15 +38,13 @@ static char sccsid[] = "@(#)setbuf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.2 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.3 2002/08/14 23:45:42 robert Exp $"); #include #include "local.h" void -setbuf(fp, buf) - FILE *fp; - char *buf; +setbuf(FILE *__restrict fp, char *__restrict buf) { (void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ); } ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/setvbuf.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.11 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.12 2002/08/14 23:45:42 robert Exp $"); #include "namespace.h" #include @@ -52,11 +52,7 @@ * a buffer. */ int -setvbuf(fp, buf, mode, size) - FILE *fp; - char *buf; - int mode; - size_t size; +setvbuf(FILE *__restrict fp, char *__restrict buf, int mode, size_t size) { int ret, flags; size_t iosize; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/snprintf.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.18 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.19 2002/08/15 09:47:10 robert Exp $"); #include #include @@ -47,7 +47,7 @@ #include "local.h" int -snprintf(char *str, size_t n, char const *fmt, ...) +snprintf(char *__restrict str, size_t n, char const *__restrict fmt, ...) { size_t on; int ret; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/sprintf.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.12 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.13 2002/08/15 09:47:10 robert Exp $"); #include #include @@ -46,7 +46,7 @@ #include "local.h" int -sprintf(char *str, char const *fmt, ...) +sprintf(char *__restrict str, char const *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.42 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.43 2002/08/15 10:28:52 robert Exp $"); /* * Actual printf innards. @@ -332,7 +332,8 @@ * MT-safe version */ int -vfprintf(FILE *fp, const char *fmt0, va_list ap) +vfprintf(FILE *__restrict fp, const char *__restrict fmt0, va_list ap) + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message