From owner-p4-projects Wed Aug 14 17:55: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF41D37B401; Wed, 14 Aug 2002 17:53:57 -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 9DD1E37B400 for ; Wed, 14 Aug 2002 17:53:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AAF243E65 for ; Wed, 14 Aug 2002 17:53:56 -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 g7F0ruJU082742 for ; Wed, 14 Aug 2002 17:53:56 -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 g7F0rp24082735 for perforce@freebsd.org; Wed, 14 Aug 2002 17:53:51 -0700 (PDT) Date: Wed, 14 Aug 2002 17:53:51 -0700 (PDT) Message-Id: <200208150053.g7F0rp24082735@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 15989 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=15989 Change 15989 by rwatson@rwatson_tislabs on 2002/08/14 17:52:56 Integ trustedbsd_mac from trustedbsd base. Various changes including trickle back of IO_NOMACCHECK, sys_pipes changes, etc. Probably some merge-o's due to conflicts that I'll resolve in follow-up commits. This integ as a prep for merging cred changes back to the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/top/display.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/config#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_srvr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_asn1.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_err.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/c_rehash#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkerr.pl#3 integrate .. //depot/projects/trustedbsd/mac/etc/MAKEDEV#12 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#4 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#16 integrate .. //depot/projects/trustedbsd/mac/etc/inetd.conf#6 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/150.clean-hoststat#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc#17 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/amd#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/keyserv#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountd#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/network#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/network1#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nfsd#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/othermta#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/rpcbind#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypserv#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypset#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypupdated#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.network#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#4 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#15 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#9 integrate .. //depot/projects/trustedbsd/mac/games/trek/DOC/trekmanual.nr#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/ld/ld.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/ld/ld.1aout#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/makewhatis/makewhatis.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/tar.1#2 integrate .. //depot/projects/trustedbsd/mac/include/wchar.h#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/include/config.h#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libasn1/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libhdb/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/dlopen.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/errlst.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtmsg.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getvfsbyname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getvfsent.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/semctl.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/collate.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/collate.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/euc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setrunelocale.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/if_indextoname.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/msgcat.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/asprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgets.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetws.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetws.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputs.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputws.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputws.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fread.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fwide.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fwide.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fwrite.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/gets.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getwc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getwchar.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/local.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putchar.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putwc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putwchar.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/refill.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/snprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/sprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/ungetwc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/ungetwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/wbuf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/acct.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getrlimit.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/intro.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_sparc64.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/termcap.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libradius/libradius.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/type.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login.conf.5#4 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_cap.h#4 integrate .. //depot/projects/trustedbsd/mac/libexec/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/libexec/bootpd/bootpd.8#3 integrate .. //depot/projects/trustedbsd/mac/libexec/comsat/comsat.8#3 integrate .. //depot/projects/trustedbsd/mac/libexec/fingerd/fingerd.8#4 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#9 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#11 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/gettytab.5#2 integrate .. //depot/projects/trustedbsd/mac/libexec/revnetgroup/revnetgroup.8#4 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#23 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#29 integrate .. //depot/projects/trustedbsd/mac/release/i386/dokern.sh#7 integrate .. //depot/projects/trustedbsd/mac/release/i386/drivers.conf#4 integrate .. //depot/projects/trustedbsd/mac/release/scripts/driver-copy2.awk#2 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpfs/dumpfs.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpon/dumpon.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/preen.c#4 delete .. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/fsirand/fsirand.8#3 integrate .. //depot/projects/trustedbsd/mac/sbin/growfs/growfs.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/init/init.8#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_ext2fs/mount_ext2fs.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nullfs/mount_nullfs.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_udf/mount_udf.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_unionfs/mount_unionfs.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/natd/natd.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/nfsiod/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/nfsiod/nfsiod.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/nfsiod/nfsiod.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/quotacheck/preen.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/umount/umount.c#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/README#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/ROADMAP#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/ReleaseNotes#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/ThankYou#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gif.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pcic.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ppp.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sio.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ti.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ucom.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uftdi.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/uvisor.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/device.hints.5#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/tuning.7#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/man8.alpha/MAKEDEV.8#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/man8.i386/MAKEDEV.8#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/picobsd.8#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/yp.8#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/mi_switch.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/style.9#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/ucred.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/uidinfo.9#4 integrate .. //depot/projects/trustedbsd/mac/share/me/tmac.orig_me#2 integrate .. //depot/projects/trustedbsd/mac/share/termcap/termcap.5#2 integrate .. //depot/projects/trustedbsd/mac/share/termcap/termcap.src#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/imgact_osf1.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/loader.8#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.4th.8#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/i386_module.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/imgact_svr4.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#14 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#44 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#12 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#24 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_sym.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-all.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-all.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cam.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/fc_log.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_cnfg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_fc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_init.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_ioc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_lan.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_raid.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_targ.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_type.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_freebsd.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbdevid.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbvar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uftdi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/uftdireg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumioctl.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wireg.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/imgact_coff.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/i4b_ioctl.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/imgact_linux.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/include/i4b_l3l4.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer3/i4b_l2if.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer3/i4b_q931.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer4/i4b_i4bdrv.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer4/i4b_l4.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer4/i4b_l4mgmt.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/sapic.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#241 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#29 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ibcs2/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_ppp/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/uftdi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_pppvar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/net/ppp_tty.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tsb.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/genassym.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tsb.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_label.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/elf_common.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/errno.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#152 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#115 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pipe.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysctl.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ucred.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#42 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extern.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_ihash.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_readwrite.c#8 delete .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_kern.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/trustedbsd/mac/tools/tools/kdrv/sample.drvinfo#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/at/at.man#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/biff/biff.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendar.1#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendar.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/colldef/parse.y#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/colldef/scan.l#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/find/function.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/fstat/fstat.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/join/join.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/lsvfs/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/lsvfs/lsvfs.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/paste/paste.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rsh/rsh.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sed/process.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/stat.1#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/stat.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/wc/wc.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/wc/wc.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xargs/xargs.c#11 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/amldb/amldb.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/adduser/adduser.perl#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/config.8#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/isdnd.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/isdnd.rc.5#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/msghdl.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/rc_config.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/rc_parse.y#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/rc_scan.l#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/support.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.8#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/keyserv/keyserv.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/matchjobs.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/nfsd/nfsd.8#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pciconf/pciconf.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/plist.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/version.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ppp.8.m4#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/system.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/watch/watch.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wicontrol/wicontrol.8#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ypserv/ypserv.8#5 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.30 2002/08/04 05:29:13 obrien Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.31 2002/08/09 10:34:57 ru Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -86,7 +86,8 @@ .It Fl v Cause .Nm -to be verbose, showing filenames as the mode is modified. If the +to be verbose, showing filenames as the mode is modified. +If the .Fl v flag is specified more than once, the old and new modes of the file will also be printed, in both octal and symbolic notation. @@ -126,7 +127,7 @@ option to .Xr mount 8 . .It Li 2000 -(the set-group-ID-on-execution bit) Executable files with this bit set +(the set-group-ID-on-execution bit) Executable files with this bit set will run with effective gid set to the gid of the file owner. .It Li 1000 (the sticky bit) @@ -139,21 +140,24 @@ .It Li 0200 Allow write by owner. .It Li 0100 -For files, allow execution by owner. For directories, allow the owner to +For files, allow execution by owner. +For directories, allow the owner to search in the directory. .It Li 0040 Allow read by group members. .It Li 0020 Allow write by group members. .It Li 0010 -For files, allow execution by group members. For directories, allow +For files, allow execution by group members. +For directories, allow group members to search in the directory. .It Li 0004 Allow read by others. .It Li 0002 Allow write by others. .It Li 0001 -For files, allow execution by others. For directories allow others to +For files, allow execution by others. +For directories allow others to search in the directory. .El .Pp ==== //depot/projects/trustedbsd/mac/bin/cp/cp.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.23 2002/07/23 00:42:56 johan Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.24 2002/08/09 10:38:34 ru Exp $ .\" .Dd April 18, 1994 .Dt CP 1 @@ -142,7 +142,7 @@ .Fl n options.) .It Fl n -Do not overwriting an existing file. +Do not overwrite an existing file. (The .Fl n option overrides any previous ==== //depot/projects/trustedbsd/mac/bin/df/df.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.40 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.41 2002/08/10 20:19:02 mux Exp $"); #include #include @@ -491,31 +491,40 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - int mib[3], maxvfsconf, cnt=0, i; - size_t miblen; - struct ovfsconf *ptr; + struct xvfsconf *xvfsp; + size_t buflen; + int cnt, i, maxvfsconf; - mib[0] = CTL_VFS; mib[1] = VFS_GENERIC; mib[2] = VFS_MAXTYPENUM; - miblen=sizeof(maxvfsconf); - if (sysctl(mib, (unsigned int)(sizeof(mib) / sizeof(mib[0])), - &maxvfsconf, &miblen, NULL, 0)) { - warnx("sysctl failed"); + if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) { + warn("sysctl(vfs.conflist)"); + return (NULL); + } + xvfsp = malloc(buflen); + if (xvfsp == NULL) { + warnx("malloc failed"); + return (NULL); + } + if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { + warn("sysctl(vfs.conflist)"); return (NULL); } + maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); return (NULL); } - for (ptr = getvfsent(); ptr; ptr = getvfsent()) - if (ptr->vfc_flags & VFCF_NETWORK) { - listptr[cnt++] = strdup(ptr->vfc_name); + for (cnt = 0, i = 0; i < maxvfsconf; i++) { + if (xvfsp->vfc_flags & VFCF_NETWORK) { + listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); return (NULL); } } + xvfsp++; + } if (cnt == 0 || (str = malloc(sizeof(char) * (32 * cnt + cnt + 2))) == NULL) { ==== //depot/projects/trustedbsd/mac/bin/ln/ln.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.23 2002/06/25 10:02:12 tjr Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.24 2002/08/12 12:34:03 tjr Exp $ .\" .Dd December 30, 1993 .Dt LN 1 @@ -191,7 +191,7 @@ The .Nm utility conforms to -.St -p1003.1-2001 . +.St -p1003.2-92 . .Pp The simplified .Nm link ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.63 2002/07/10 20:44:54 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.64 2002/08/11 13:05:17 schweikh Exp $"); #include #include @@ -114,7 +114,7 @@ int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ - int f_stream; /* stream the output, seperate with commas */ + int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ ==== //depot/projects/trustedbsd/mac/bin/mv/mv.1#5 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.22 2002/07/09 17:45:13 johan Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.23 2002/08/09 10:46:00 ru Exp $ .\" -.Dd May 31, 1993 +.Dd July 9, 2002 .Dt MV 1 .Os .Sh NAME @@ -43,11 +43,11 @@ .Nd move files .Sh SYNOPSIS .Nm -.Op Fl f | Fl i | Fl n +.Op Fl f | i | n .Op Fl v .Ar source target .Nm -.Op Fl f | Fl i | Fl n +.Op Fl f | i | n .Op Fl v .Ar source ... directory .Sh DESCRIPTION @@ -73,7 +73,7 @@ component of the named file. .Pp The following options are available: -.Bl -tag -width flag +.Bl -tag -width indent .It Fl f Do not prompt for confirmation before overwriting the destination path. @@ -90,9 +90,9 @@ to write a prompt to standard error before moving a file that would overwrite an existing file. If the response from the standard input begins with the character -.Sq Li y +.Ql y or -.Sq Li Y , +.Ql Y , the move is attempted. (The .Fl i @@ -127,7 +127,7 @@ option. .Pp As the -.Xr rename 2 +.Xr rename 2 call does not work across filesystems, .Nm uses @@ -138,8 +138,8 @@ The effect is equivalent to: .Bd -literal -offset indent rm -f destination_path && \e -\tcp -pRP source_file destination && \e -\trm -rf source_file +cp -pRP source_file destination && \e +rm -rf source_file .Ed .Sh DIAGNOSTICS .Ex -std ==== //depot/projects/trustedbsd/mac/bin/ps/ps.1#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.55 2002/06/10 22:48:51 jmallett Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.56 2002/08/09 10:49:50 ru Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -245,7 +245,8 @@ is displayed. .It mwchan The event name if the process is blocked normally, or the mutex name if -the process is blocked on a mutex. See the wchan and mtxname keywords +the process is blocked on a mutex. +See the wchan and mtxname keywords for details. .It nice The process scheduling increment (see @@ -382,7 +383,7 @@ .It args command and arguments .It comm -command +command .It command command and arguments .It cpu ==== //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rcp.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.14 2002/04/16 20:07:10 charnier Exp $ +.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.15 2002/08/09 16:12:08 ume Exp $ .\" .Dd May 31, 1993 .Dt RCP 1 @@ -40,11 +40,11 @@ .Nd remote file copy .Sh SYNOPSIS .Nm -.Op Fl Kpx +.Op Fl 46Kpx .Op Fl k Ar realm .Ar file1 file2 .Nm -.Op Fl Kprx +.Op Fl 46Kprx .Op Fl k Ar realm .Ar .Ar directory @@ -63,6 +63,10 @@ .Pp The following options are available: .Bl -tag -width indent +.It Fl 4 +Use IPv4 addresses only. +.It Fl 6 +Use IPv6 addresses only. .It Fl K Turn off all Kerberos authentication. .It Fl k ==== //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.34 2002/07/10 20:44:55 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.35 2002/08/09 16:12:08 ume Exp $"); #include #include @@ -92,12 +92,12 @@ extern char *krb_realmofhost(); #ifdef CRYPT int doencrypt = 0; -#define OPTIONS "dfKk:prtx" +#define OPTIONS "46dfKk:prtx" #else -#define OPTIONS "dfKk:prt" +#define OPTIONS "46dfKk:prt" #endif #else -#define OPTIONS "dfprt" +#define OPTIONS "46dfprt" #endif struct passwd *pwd; @@ -105,6 +105,7 @@ uid_t userid; int errs, rem; int pflag, iamremote, iamrecursive, targetshouldbedirectory; +int family = PF_UNSPEC; static int argc_copy; static char **argv_copy; @@ -154,6 +155,14 @@ fflag = tflag = 0; while ((ch = getopt(argc, argv, OPTIONS)) != -1) switch(ch) { /* User-visible flags. */ + case '4': + family = PF_INET; + break; + + case '6': + family = PF_INET6; + break; + case 'K': #ifdef KERBEROS use_kerberos = 0; @@ -344,15 +353,18 @@ tuser ? tuser : pwd->pw_name); else #endif - rem = rcmd(&host, port, pwd->pw_name, + rem = rcmd_af(&host, port, + pwd->pw_name, tuser ? tuser : pwd->pw_name, - bp, 0); + bp, 0, family); if (rem < 0) exit(1); - tos = IPTOS_THROUGHPUT; - if (setsockopt(rem, IPPROTO_IP, IP_TOS, - &tos, sizeof(int)) < 0) - warn("TOS (ignored)"); + if (family == PF_INET) { + tos = IPTOS_THROUGHPUT; + if (setsockopt(rem, IPPROTO_IP, IP_TOS, + &tos, sizeof(int)) < 0) + warn("TOS (ignored)"); + } if (response() < 0) exit(1); (void)free(bp); @@ -408,16 +420,20 @@ use_kerberos ? kerberos(&host, bp, pwd->pw_name, suser) : #endif - rcmd(&host, port, pwd->pw_name, suser, bp, 0); + rcmd_af(&host, port, pwd->pw_name, suser, bp, 0, + family); (void)free(bp); if (rem < 0) { ++errs; continue; } (void)seteuid(userid); - tos = IPTOS_THROUGHPUT; - if (setsockopt(rem, IPPROTO_IP, IP_TOS, &tos, sizeof(int)) < 0) - warn("TOS (ignored)"); + if (family == PF_INET) { + tos = IPTOS_THROUGHPUT; + if (setsockopt(rem, IPPROTO_IP, IP_TOS, &tos, + sizeof(int)) < 0) + warn("TOS (ignored)"); + } sink(1, argv + argc - 1); (void)seteuid(0); (void)close(rem); @@ -834,7 +850,7 @@ errx(1, "the -x option requires Kerberos authentication"); #endif - rem = rcmd(host, port, locuser, user, bp, 0); + rem = rcmd_af(host, port, locuser, user, bp, 0, family); } return (rem); } @@ -879,17 +895,17 @@ #ifdef KERBEROS #ifdef CRYPT (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-Kpx] [-k realm] f1 f2", - " rcp [-Kprx] [-k realm] f1 ... fn directory"); + "usage: rcp [-46Kpx] [-k realm] f1 f2", + " rcp [-46Kprx] [-k realm] f1 ... fn directory"); #else (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-Kp] [-k realm] f1 f2", - " rcp [-Kpr] [-k realm] f1 ... fn directory"); + "usage: rcp [-46Kp] [-k realm] f1 f2", + " rcp [-46Kpr] [-k realm] f1 ... fn directory"); #endif #else (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-p] f1 f2", - " rcp [-pr] f1 ... fn directory"); + "usage: rcp [-46p] f1 f2", + " rcp [-46pr] f1 ... fn directory"); #endif exit(1); } ==== //depot/projects/trustedbsd/mac/bin/sh/parser.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.42 2002/07/22 05:50:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.43 2002/08/11 03:04:23 tjr Exp $"); #include @@ -478,15 +478,14 @@ break; /* Handle an empty command like other simple commands. */ case TSEMI: + case TAND: + case TOR: /* * An empty command before a ; doesn't make much sense, and * should certainly be disallowed in the case of `if ;'. */ if (!redir) synexpect(-1); - case TAND: - case TOR: - synexpect(-1); case TNL: case TEOF: case TWORD: ==== //depot/projects/trustedbsd/mac/bin/sh/sh.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.75 2002/07/25 10:57:39 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.76 2002/08/09 10:59:20 ru Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1280,7 +1280,7 @@ (see .Ic unalias ) . Alias values are written with appropriate quoting so that they are -suitable for reinput to the shell. +suitable for re-input to the shell. .It Ic bg Op Ar job ... Continue the specified jobs (or the current job if no jobs are given) @@ -1305,7 +1305,7 @@ If .Ar directory does not begin with -.Pa / , . , +.Pa / , \&. , or .Pa .. , then the directories listed in the @@ -1347,14 +1347,7 @@ A synonym for the .Ic cd builtin command. -.It Xo -.Ic command -.Op Fl p -.Oo -.Ar utility -.Op Ar argument ... -.Oc -.Xc +.It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ... Execute the specified .Ar utility as a simple command (see the @@ -1367,11 +1360,7 @@ default value of .Ev PATH that is guaranteed to find all of the standard utilities. -.It Xo -.Ic echo -.Op Fl e | Fl n -.Op Ar string -.Xc +.It Ic echo Oo Fl e | n Oc Op Ar string Print .Ar string to the standard output with a newline appended. @@ -1453,11 +1442,7 @@ is given it is used as the exit status of the shell; otherwise the exit status of the preceding command is used. -.It Xo -.Ic export -.Op Fl p -.Op Ar name ... -.Xc +.It Ic export Oo Fl p Oc Op Ar name ... The specified names are exported so that they will appear in the environment of subsequent commands. The only way to un-export a variable is to @@ -1628,11 +1613,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message