PERFORCE change 130463 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Dec 7 21:24:04 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130463
Change 130463 by marcel at marcel_xcllnt on 2007/12/08 05:23:18
IFC @130450
Affected files ...
.. //depot/projects/ia64/Makefile.inc1#121 integrate
.. //depot/projects/ia64/ObsoleteFiles.inc#22 integrate
.. //depot/projects/ia64/bin/sh/sh.1#39 integrate
.. //depot/projects/ia64/contrib/amd/AUTHORS#4 integrate
.. //depot/projects/ia64/contrib/amd/BUGS#4 integrate
.. //depot/projects/ia64/contrib/amd/COPYING#4 integrate
.. //depot/projects/ia64/contrib/amd/ChangeLog#4 integrate
.. //depot/projects/ia64/contrib/amd/FAQ#1 branch
.. //depot/projects/ia64/contrib/amd/INSTALL#4 integrate
.. //depot/projects/ia64/contrib/amd/NEWS#4 integrate
.. //depot/projects/ia64/contrib/amd/README.attrcache#1 branch
.. //depot/projects/ia64/contrib/amd/README.ldap#3 integrate
.. //depot/projects/ia64/contrib/amd/amd/am_ops.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amd.8#6 integrate
.. //depot/projects/ia64/contrib/amd/amd/amd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amd.h#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_auto.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_direct.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_error.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/ia64/contrib/amd/amd/amfs_host.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_inherit.c#4 delete
.. //depot/projects/ia64/contrib/amd/amd/amfs_link.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_linkx.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_nfsl.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_nfsx.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_program.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_root.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_toplvl.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amfs_union.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amq_subr.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/amq_svc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/autil.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/clock.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/conf.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/conf_parse.y#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/conf_tok.l#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/get_args.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/ia64/contrib/amd/amd/info_file.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_hesiod.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_ldap.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_ndbm.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_nis.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_nisplus.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_passwd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/info_union.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/map.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/mapc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/mntfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/nfs_prot_svc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/nfs_start.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/nfs_subr.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_TEMPLATE.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_cachefs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_cdfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_efs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_lofs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_mfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_nfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_nfs3.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_nullfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_pcfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_tfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_tmpfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_ufs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_umapfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_unionfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/ops_xfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/opts.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/ia64/contrib/amd/amd/restart.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/rpc_fwd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/sched.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/srvr_amfs_auto.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amd/srvr_nfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq.8#7 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq.c#6 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq.h#4 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq_clnt.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amq/amq_xdr.c#4 integrate
.. //depot/projects/ia64/contrib/amd/amq/pawd.1#5 integrate
.. //depot/projects/ia64/contrib/amd/amq/pawd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/aux_conf.h.in#3 integrate
.. //depot/projects/ia64/contrib/amd/bootstrap#3 integrate
.. //depot/projects/ia64/contrib/amd/conf/checkmount/checkmount_bsd44.c#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/mtab/mtab_bsd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate
.. //depot/projects/ia64/contrib/amd/conf/transp/transp_sockets.c#5 integrate
.. //depot/projects/ia64/contrib/amd/conf/trap/trap_default.h#4 integrate
.. //depot/projects/ia64/contrib/amd/conf/umount/umount_bsd44.c#4 integrate
.. //depot/projects/ia64/contrib/amd/doc/am-utils.texi#4 integrate
.. //depot/projects/ia64/contrib/amd/doc/stamp-vti#3 branch
.. //depot/projects/ia64/contrib/amd/doc/texinfo.tex#3 integrate
.. //depot/projects/ia64/contrib/amd/doc/version.texi#4 integrate
.. //depot/projects/ia64/contrib/amd/fixmount/fixmount.8#8 integrate
.. //depot/projects/ia64/contrib/amd/fixmount/fixmount.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_analyze.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_data.h#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_dict.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_gram.y#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_lex.l#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsi_util.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.8#8 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.h#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_atab.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_bparam.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_dumpset.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_exportfs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/wr_fstab.c#4 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.8#7 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.c#4 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.h#7 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/homedir.c#4 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/nfs_prot_svc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/hlfsd/stubs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/include/am_compat.h#3 integrate
.. //depot/projects/ia64/contrib/amd/include/am_defs.h#4 integrate
.. //depot/projects/ia64/contrib/amd/include/am_utils.h#4 integrate
.. //depot/projects/ia64/contrib/amd/include/am_xdr_func.h#4 integrate
.. //depot/projects/ia64/contrib/amd/include/amq_defs.h#4 integrate
.. //depot/projects/ia64/contrib/amd/include/mount_headers1.h#3 integrate
.. //depot/projects/ia64/contrib/amd/include/mount_headers2.h#2 integrate
.. //depot/projects/ia64/contrib/amd/ldap-id.ms#2 integrate
.. //depot/projects/ia64/contrib/amd/ldap.schema#1 branch
.. //depot/projects/ia64/contrib/amd/libamu/alloca.c#2 delete
.. //depot/projects/ia64/contrib/amd/libamu/amu.h#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/hasmntopt.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/misc_rpc.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/mount_fs.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/mtab.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/nfs_prot_xdr.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/strerror.c#3 integrate
.. //depot/projects/ia64/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/ia64/contrib/amd/libamu/util.c#4 delete
.. //depot/projects/ia64/contrib/amd/libamu/wire.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/xdr_func.c#4 integrate
.. //depot/projects/ia64/contrib/amd/libamu/xutil.c#4 integrate
.. //depot/projects/ia64/contrib/amd/m4/GNUmakefile#2 delete
.. //depot/projects/ia64/contrib/amd/m4/amdgrep#2 delete
.. //depot/projects/ia64/contrib/amd/m4/amindent#2 delete
.. //depot/projects/ia64/contrib/amd/m4/autopat#2 delete
.. //depot/projects/ia64/contrib/amd/m4/chop-aclocal.pl#2 delete
.. //depot/projects/ia64/contrib/amd/m4/copy-if-newbig#2 delete
.. //depot/projects/ia64/contrib/amd/m4/macros/HEADER#2 delete
.. //depot/projects/ia64/contrib/amd/m4/macros/TRAILER#2 delete
.. //depot/projects/ia64/contrib/amd/m4/mk-aclocal#2 delete
.. //depot/projects/ia64/contrib/amd/m4/mkconf#2 delete
.. //depot/projects/ia64/contrib/amd/m4/rmtspc#2 delete
.. //depot/projects/ia64/contrib/amd/m4/update_build_version#2 delete
.. //depot/projects/ia64/contrib/amd/mk-amd-map/mk-amd-map.8#5 integrate
.. //depot/projects/ia64/contrib/amd/mk-amd-map/mk-amd-map.c#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/am-eject.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/amd.conf-sample#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/amd.conf.5#7 integrate
.. //depot/projects/ia64/contrib/amd/scripts/amd2ldif.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/amd2sun.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/automount2amd.8#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/automount2amd.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/ctl-amd.in#3 integrate
.. //depot/projects/ia64/contrib/amd/scripts/ctl-hlfsd.in#3 integrate
.. //depot/projects/ia64/contrib/amd/scripts/expn.1#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/expn.in#4 integrate
.. //depot/projects/ia64/contrib/amd/scripts/fix-amd-map.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/fixrmtab.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/ia64/contrib/amd/scripts/wait4amd.in#2 integrate
.. //depot/projects/ia64/contrib/amd/scripts/wait4amd2die.in#2 integrate
.. //depot/projects/ia64/contrib/amd/tasks#4 integrate
.. //depot/projects/ia64/contrib/amd/vers.m4#1 branch
.. //depot/projects/ia64/contrib/amd/wire-test/wire-test.8#5 integrate
.. //depot/projects/ia64/contrib/amd/wire-test/wire-test.c#4 integrate
.. //depot/projects/ia64/contrib/pf/pflogd/pidfile.c#7 delete
.. //depot/projects/ia64/contrib/pf/pflogd/pidfile.h#4 delete
.. //depot/projects/ia64/games/fortune/datfiles/Makefile#8 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes#68 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#10 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes.sp.ok#6 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#15 delete
.. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#21 integrate
.. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch
.. //depot/projects/ia64/games/fortune/datfiles/limerick#10 integrate
.. //depot/projects/ia64/games/fortune/datfiles/limerick.sp.ok#1 branch
.. //depot/projects/ia64/games/fortune/datfiles/murphy#7 integrate
.. //depot/projects/ia64/games/fortune/datfiles/murphy-o#3 integrate
.. //depot/projects/ia64/games/fortune/datfiles/murphy.sp.ok#1 branch
.. //depot/projects/ia64/games/fortune/datfiles/startrek#10 integrate
.. //depot/projects/ia64/games/fortune/datfiles/zippy#5 integrate
.. //depot/projects/ia64/games/fortune/datfiles/zippy.sp.ok#2 integrate
.. //depot/projects/ia64/lib/csu/common/crtbrand.c#6 integrate
.. //depot/projects/ia64/lib/libarchive/archive_read_support_format_zip.c#11 integrate
.. //depot/projects/ia64/lib/libkse/thread/thr_kern.c#2 integrate
.. //depot/projects/ia64/lib/libpmc/libpmc.c#6 integrate
.. //depot/projects/ia64/lib/libpthread/arch/ia64/include/atomic_ops.h#3 delete
.. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#13 delete
.. //depot/projects/ia64/libexec/rtld-aout/support.c#4 delete
.. //depot/projects/ia64/libexec/rtld-aout/support.h#4 delete
.. //depot/projects/ia64/release/fixit.profile#3 integrate
.. //depot/projects/ia64/sbin/dhclient/dispatch.c#2 integrate
.. //depot/projects/ia64/share/examples/cvsup/refuse#8 integrate
.. //depot/projects/ia64/share/examples/cvsup/refuse.README#9 integrate
.. //depot/projects/ia64/share/man/man4/aac.4#17 integrate
.. //depot/projects/ia64/share/man/man4/hwpmc.4#11 integrate
.. //depot/projects/ia64/share/man/man4/msk.4#5 integrate
.. //depot/projects/ia64/share/mk/bsd.subdir.mk#13 integrate
.. //depot/projects/ia64/sys/amd64/amd64/exception.S#18 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#66 integrate
.. //depot/projects/ia64/sys/amd64/amd64/trap.c#36 integrate
.. //depot/projects/ia64/sys/amd64/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/arm/arm/pmap.c#30 integrate
.. //depot/projects/ia64/sys/arm/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32.h#5 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_ipc.h#1 branch
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#28 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#26 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#26 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#26 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#26 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#25 integrate
.. //depot/projects/ia64/sys/conf/Makefile.amd64#15 integrate
.. //depot/projects/ia64/sys/conf/NOTES#120 integrate
.. //depot/projects/ia64/sys/conf/files#161 integrate
.. //depot/projects/ia64/sys/conf/options#111 integrate
.. //depot/projects/ia64/sys/dev/aac/aac.c#54 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_cam.c#26 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_pci.c#42 integrate
.. //depot/projects/ia64/sys/dev/aac/aacreg.h#16 integrate
.. //depot/projects/ia64/sys/dev/aac/aacvar.h#24 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#60 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_amd.c#6 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_arm.c#2 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_logging.c#6 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_mod.c#10 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_piv.c#8 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate
.. //depot/projects/ia64/sys/dev/hwpmc/hwpmc_x86.c#5 integrate
.. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#28 integrate
.. //depot/projects/ia64/sys/dev/ipw/if_ipw.c#13 integrate
.. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#18 integrate
.. //depot/projects/ia64/sys/dev/msk/if_msk.c#7 integrate
.. //depot/projects/ia64/sys/dev/msk/if_mskreg.h#6 integrate
.. //depot/projects/ia64/sys/dev/re/if_re.c#37 integrate
.. //depot/projects/ia64/sys/dev/sio/sio.c#76 integrate
.. //depot/projects/ia64/sys/dev/utopia/utopia.c#11 integrate
.. //depot/projects/ia64/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/ia64/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate
.. //depot/projects/ia64/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/ia64/sys/geom/geom_bsd.c#47 integrate
.. //depot/projects/ia64/sys/geom/part/g_part.c#8 integrate
.. //depot/projects/ia64/sys/geom/part/g_part.h#7 integrate
.. //depot/projects/ia64/sys/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/ia64/sys/i386/bios/apm.c#15 integrate
.. //depot/projects/ia64/sys/i386/i386/exception.s#20 integrate
.. //depot/projects/ia64/sys/i386/i386/pmap.c#106 integrate
.. //depot/projects/ia64/sys/i386/i386/trap.c#62 integrate
.. //depot/projects/ia64/sys/i386/include/pmc_mdep.h#4 integrate
.. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#10 integrate
.. //depot/projects/ia64/sys/ia64/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/kern/imgact_elf.c#52 integrate
.. //depot/projects/ia64/sys/kern/init_main.c#67 integrate
.. //depot/projects/ia64/sys/kern/kern_conf.c#45 integrate
.. //depot/projects/ia64/sys/kern/kern_exec.c#91 integrate
.. //depot/projects/ia64/sys/kern/kern_mbuf.c#17 integrate
.. //depot/projects/ia64/sys/kern/kern_mib.c#24 integrate
.. //depot/projects/ia64/sys/kern/kern_module.c#18 integrate
.. //depot/projects/ia64/sys/kern/kern_pmc.c#5 integrate
.. //depot/projects/ia64/sys/kern/subr_trap.c#60 integrate
.. //depot/projects/ia64/sys/kern/vfs_mount.c#60 integrate
.. //depot/projects/ia64/sys/kern/vfs_subr.c#101 integrate
.. //depot/projects/ia64/sys/net/if_lagg.c#5 integrate
.. //depot/projects/ia64/sys/net/if_var.h#39 integrate
.. //depot/projects/ia64/sys/net/route.c#31 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211.c#25 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_output.c#25 integrate
.. //depot/projects/ia64/sys/netinet/if_ether.c#44 integrate
.. //depot/projects/ia64/sys/netinet/in_pcb.h#36 integrate
.. //depot/projects/ia64/sys/netinet/libalias/alias_util.c#6 integrate
.. //depot/projects/ia64/sys/netinet/sctp.h#7 integrate
.. //depot/projects/ia64/sys/netinet/sctp_output.c#11 integrate
.. //depot/projects/ia64/sys/netinet/sctp_structs.h#10 integrate
.. //depot/projects/ia64/sys/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/ia64/sys/netinet/sctputil.c#11 integrate
.. //depot/projects/ia64/sys/netinet/tcp_syncache.c#52 integrate
.. //depot/projects/ia64/sys/netinet/tcp_var.h#41 integrate
.. //depot/projects/ia64/sys/netinet6/in6.c#32 integrate
.. //depot/projects/ia64/sys/pci/if_rlreg.h#40 integrate
.. //depot/projects/ia64/sys/powerpc/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/security/audit/audit.c#10 integrate
.. //depot/projects/ia64/sys/sparc64/include/pmc_mdep.h#3 integrate
.. //depot/projects/ia64/sys/sun4v/include/pmc_mdep.h#2 integrate
.. //depot/projects/ia64/sys/sys/param.h#86 integrate
.. //depot/projects/ia64/sys/sys/pmc.h#8 integrate
.. //depot/projects/ia64/sys/sys/pmckern.h#5 integrate
.. //depot/projects/ia64/sys/sys/pmclog.h#4 integrate
.. //depot/projects/ia64/sys/sys/proc.h#114 integrate
.. //depot/projects/ia64/sys/sys/systm.h#57 integrate
.. //depot/projects/ia64/sys/sys/ucred.h#23 integrate
.. //depot/projects/ia64/tools/tools/ath/athdebug/athdebug.c#2 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/athstats.c#4 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/athstats.h#2 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/ia64/tools/tools/ath/athstats/statfoo.h#2 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/statfoo.h#2 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/wlanstats.c#5 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/wlanstats.h#2 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanwatch/wlanwatch.c#3 integrate
.. //depot/projects/ia64/usr.bin/kdump/kdump.c#16 integrate
.. //depot/projects/ia64/usr.sbin/Makefile#86 integrate
.. //depot/projects/ia64/usr.sbin/amd/amd/Makefile#6 integrate
.. //depot/projects/ia64/usr.sbin/amd/fsinfo/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/amd/include/amu_autofs_prot.h#1 branch
.. //depot/projects/ia64/usr.sbin/amd/include/aux_conf.h#3 integrate
.. //depot/projects/ia64/usr.sbin/amd/include/build_version.h#2 integrate
.. //depot/projects/ia64/usr.sbin/amd/include/config.h#5 integrate
.. //depot/projects/ia64/usr.sbin/amd/include/newvers.sh#4 integrate
.. //depot/projects/ia64/usr.sbin/amd/libamu/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/amd/mk-amd-map/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/mtree/verify.c#9 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/Makefile#5 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.8#7 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.c#9 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat.h#4 integrate
.. //depot/projects/ia64/usr.sbin/pmcstat/pmcstat_log.c#7 integrate
.. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#32 integrate
Differences ...
==== //depot/projects/ia64/Makefile.inc1#121 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -591,17 +591,25 @@
#
distributeworld installworld: installcheck
mkdir -p ${INSTALLTMP}
- for prog in ${ITOOLS}; do \
+ progs=$$(for prog in ${ITOOLS}; do \
if progpath=`which $$prog`; then \
- progs="$$progs $$progpath"; \
+ echo $$progpath; \
else \
echo "Required tool $$prog not found in PATH." >&2; \
exit 1; \
fi; \
- done; \
- cp $$progs ${INSTALLTMP}; \
- cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
- sort -u` ${INSTALLTMP}
+ done); \
+ libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+ while read line; do \
+ set -- $$line; \
+ if [ "$$2 $$3" != "not found" ]; then \
+ echo $$2; \
+ else \
+ echo "Required library $$1 not found." >&2; \
+ exit 1; \
+ fi; \
+ done); \
+ cp $$libs $$progs ${INSTALLTMP}
cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
${IMAKEENV} rm -rf ${INSTALLTMP}
==== //depot/projects/ia64/ObsoleteFiles.inc#22 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20071207: Merged with fortunes-o.real
+OLD_FILES+=usr/share/games/fortune/fortunes2-o
+OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
# 20071129: Disabled static versions of libkse by default
.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
OLD_FILES+=usr/lib/libkse.a
==== //depot/projects/ia64/bin/sh/sh.1#39 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.126 2007/12/05 12:29:26 ru Exp $
.\"
.Dd October 7, 2006
.Dt SH 1
@@ -57,9 +57,12 @@
This version has many features which make
it appear
similar in some respects to the Korn shell, but it is not a Korn
-shell clone like pdksh.
+shell clone like
+.Nm pdksh .
Only features
-designated by POSIX, plus a few Berkeley extensions, are being
+designated by
+.Tn POSIX ,
+plus a few Berkeley extensions, are being
incorporated into this shell.
This man page is not intended to be a tutorial nor a complete
specification of the shell.
@@ -107,6 +110,7 @@
.Pa /etc/profile
and then
.Pa .profile
+in a user's home directory,
if they exist.
If the environment variable
.Ev ENV
@@ -129,13 +133,15 @@
.Pa .shinit
the filename desired:
.Pp
-.Dl ENV=$HOME/.shinit; export ENV
+.Dl "ENV=$HOME/.shinit; export ENV"
.Pp
The first non-option argument specified on the command line
will be treated as the
name of a file from which to read commands (a shell script), and
the remaining arguments are set as the positional parameters
-of the shell ($1, $2, etc).
+of the shell
+.Li ( $1 , $2 ,
+etc.).
Otherwise, the shell reads commands
from its standard input.
.Pp
@@ -180,7 +186,7 @@
A
.Dq Li --
or plain
-.Dq Ql -
+.Ql -
will stop option processing and will force the remaining
words on the command line to be treated as arguments.
The
@@ -198,7 +204,7 @@
(UNIMPLEMENTED)
.It Fl C Li noclobber
Do not overwrite existing files with
-.Dq Li > .
+.Ql > .
.It Fl E Li emacs
Enable the built-in
.Xr emacs 1
@@ -228,7 +234,7 @@
Disable pathname expansion.
.It Fl I Li ignoreeof
Ignore
-.Dv EOF Ns ' Ns s
+.Dv EOF Ap s
from input when in interactive mode.
.It Fl i Li interactive
Force the shell to behave interactively.
@@ -253,10 +259,10 @@
.It Fl p Li privileged
Turn on privileged mode.
This mode is enabled on startup
-if either the effective user or group id is not equal to the
-real user or group id.
+if either the effective user or group ID is not equal to the
+real user or group ID.
Turning this mode off sets the
-effective user and group ids to the real user and group ids.
+effective user and group IDs to the real user and group IDs.
When this mode is enabled for interactive shells, the file
.Pa /etc/suid_profile
is sourced instead of
@@ -288,7 +294,6 @@
.Bd -literal -offset indent
sh -T -c "trap 'exit 1' 2 ; some-blocking-program"
.Ed
-.Pp
.It Fl u Li nounset
Write a message to standard error when attempting
to expand a variable that is not set, and if the
@@ -306,7 +311,7 @@
.It Fl x Li xtrace
Write each command
(preceded by the value of the
-.Ev PS4
+.Va PS4
variable)
to standard error before it is executed.
Useful for debugging.
@@ -384,7 +389,7 @@
it impossible to put single-quotes in a single-quoted string).
.It Double Quotes
Enclosing characters within double quotes preserves the literal
-meaning of all characters except dollarsign
+meaning of all characters except dollar sign
.Pq Ql $ ,
backquote
.Pq Ql ` ,
@@ -423,16 +428,14 @@
For example, if there is an alias called
.Dq Li lf
with the value
-.Dq Li ls -F ,
+.Dq Li "ls -F" ,
then the input
-.Bd -literal -offset indent
-lf foobar
-.Ed
+.Pp
+.Dl "lf foobar"
.Pp
would become
-.Bd -literal -offset indent
-ls -F foobar
-.Ed
+.Pp
+.Dl "ls -F foobar"
.Pp
Aliases provide a convenient way for naive users to
create shorthands for commands without having to learn how
@@ -498,10 +501,10 @@
The overall format
used for redirection is:
.Pp
-.Dl [n] redir-op file
+.D1 Oo Ar n Oc Ar redir-op file
.Pp
The
-.Ql redir-op
+.Ar redir-op
is one of the redirection operators mentioned
previously.
The following gives some examples of how these
@@ -509,42 +512,66 @@
Note that stdin and stdout are commonly used abbreviations
for standard input and standard output respectively.
.Bl -tag -width "1234567890XX" -offset indent
-.It Li [n]> file
-redirect stdout (or file descriptor n) to file
-.It Li [n]>| file
+.It Oo Ar n Oc Ns Li > Ar file
+redirect stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li >| Ar file
same as above, but override the
.Fl C
option
-.It Li [n]>> file
-append stdout (or file descriptor n) to file
-.It Li [n]< file
-redirect stdin (or file descriptor n) from file
-.It Li [n]<> file
-redirect stdin (or file descriptor n) to and from file
-.It Li [n1]<&n2
-duplicate stdin (or file descriptor n1) from file descriptor n2
-.It Li [n]<&-
-close stdin (or file descriptor n)
-.It Li [n1]>&n2
-duplicate stdout (or file descriptor n1) to file descriptor n2
-.It Li [n]>&-
-close stdout (or file descriptor n)
+.It Oo Ar n Oc Ns Li >> Ar file
+append stdout (or file descriptor
+.Ar n )
+to
+.Ar file
+.It Oo Ar n Oc Ns Li < Ar file
+redirect stdin (or file descriptor
+.Ar n )
+from
+.Ar file
+.It Oo Ar n Oc Ns Li <> Ar file
+redirect stdin (or file descriptor
+.Ar n )
+to and from
+.Ar file
+.It Oo Ar n1 Oc Ns Li <& Ns Ar n2
+duplicate stdin (or file descriptor
+.Ar n1 )
+from file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li <&-
+close stdin (or file descriptor
+.Ar n )
+.It Oo Ar n1 Oc Ns Li >& Ns Ar n2
+duplicate stdout (or file descriptor
+.Ar n1 )
+to file descriptor
+.Ar n2
+.It Oo Ar n Oc Ns Li >&-
+close stdout (or file descriptor
+.Ar n )
.El
.Pp
The following redirection is often called a
.Dq here-document .
-.Bd -literal -offset indent
-[n]<< delimiter
- here-doc-text
- ...
-delimiter
+.Bd -unfilled -offset indent
+.Oo Ar n Oc Ns Li << Ar delimiter
+.D1 Ar here-doc-text
+.D1 ...
+.Ar delimiter
.Ed
.Pp
All the text on successive lines up to the delimiter is
saved away and made available to the command on standard
-input, or file descriptor n if it is specified.
-If the delimiter
-as specified on the initial line is quoted, then the here-doc-text
+input, or file descriptor
+.Ar n
+if it is specified.
+If the
+.Ar delimiter
+as specified on the initial line is quoted, then the
+.Ar here-doc-text
is treated literally, otherwise the text is subjected to
parameter expansion, command substitution, and arithmetic
expansion (as described in the section on
@@ -554,7 +581,9 @@
instead of
.Dq Li << ,
then leading tabs
-in the here-doc-text are stripped.
+in the
+.Ar here-doc-text
+are stripped.
.Ss Search and Execution
There are three types of commands: shell functions,
built-in commands, and normal programs.
@@ -562,7 +591,9 @@
The three types of commands are all executed in a different way.
.Pp
When a shell function is executed, all of the shell positional
-parameters (except $0, which remains unchanged) are
+parameters (except
+.Li $0 ,
+which remains unchanged) are
set to the arguments of the shell function.
The variables which are explicitly placed in the environment of
the command (by placing assignments to them before the
@@ -583,11 +614,11 @@
passing the arguments and the environment to the program.
If the program is not a normal executable file
(i.e., if it does not begin with the
-.Qq magic number
+.Dq "magic number"
whose
.Tn ASCII
representation is
-.Qq #! ,
+.Dq Li #! ,
resulting in an
.Er ENOEXEC
return value from
@@ -597,13 +628,16 @@
so that the effect will be
as if a new shell had been invoked to handle the ad-hoc shell script,
except that the location of hashed commands located in
-the parent shell will be remembered by the child.
+the parent shell will be remembered by the child
+(see the description of the
+.Ic hash
+built-in command below).
.Pp
Note that previous versions of this document
and the source code itself misleadingly and sporadically
refer to a shell script without a magic number
as a
-.Qq shell procedure .
+.Dq "shell procedure" .
.Ss Path Search
When locating a command, the shell first looks to see if
it has a shell function by that name.
@@ -616,8 +650,9 @@
Command names containing a slash are simply executed without
performing any searches.
.It
-The shell searches each entry in
+The shell searches each entry in the
.Ev PATH
+environment variable
in turn for the command.
The value of the
.Ev PATH
@@ -666,7 +701,8 @@
that of the last simple command executed by the command.
.Ss Pipelines
A pipeline is a sequence of one or more commands separated
-by the control operator |.
+by the control operator
+.Ql \&| .
The standard output of all but
the last command is connected to the standard input
of the next command.
@@ -675,10 +711,12 @@
.Pp
The format for a pipeline is:
.Pp
-.Dl [!] command1 [ | command2 ...]
+.D1 Oo Li \&! Oc Ar command1 Op Li \&| Ar command2 ...
.Pp
-The standard output of command1 is connected to the standard
-input of command2.
+The standard output of
+.Ar command1
+is connected to the standard input of
+.Ar command2 .
The standard input, standard output, or
both of a command is considered to be assigned by the
pipeline before any redirection specified by redirection
@@ -704,22 +742,22 @@
modified by redirection.
For example:
.Pp
-.Dl $ command1 2>&1 | command2
+.Dl "command1 2>&1 | command2"
.Pp
sends both the standard output and standard error of
-.Ql command1
+.Ar command1
to the standard input of
-.Ql command2 .
+.Ar command2 .
.Pp
A
-.Dq Li \&;
+.Ql \&;
or newline terminator causes the preceding
AND-OR-list
(described below in the section called
.Sx Short-Circuit List Operators )
to be executed sequentially;
an
-.Dq Li &
+.Ql &
causes asynchronous execution of the preceding AND-OR-list.
.Pp
Note that unlike some other shells,
@@ -738,12 +776,12 @@
before executing the next command.
.Pp
The format for running a command in background is:
-.Bd -literal -offset indent
-command1 & [command2 & ...]
-.Ed
+.Pp
+.D1 Ar command1 Li & Op Ar command2 Li & Ar ...
.Pp
If the shell is not interactive, the standard input of an
-asynchronous command is set to /dev/null.
+asynchronous command is set to
+.Pa /dev/null .
.Ss Lists (Generally Speaking)
A list is a sequence of zero or more commands separated by
newlines, semicolons, or ampersands,
@@ -773,22 +811,23 @@
The syntax of the
.Ic if
command is:
-.\"
-.\" XXX Use .Dl to work around broken handling of .Ic inside .Bd and .Ed .
-.\"
-.Dl Ic if Ar list
-.Dl Ic then Ar list
-.Dl [ Ic elif Ar list
-.Dl Ic then Ar list ] ...
-.Dl [ Ic else Ar list ]
-.Dl Ic fi
+.Bd -unfilled -offset indent -compact
+.Ic if Ar list
+.Ic then Ar list
+.Oo Ic elif Ar list
+.Ic then Ar list Oc Ar ...
+.Op Ic else Ar list
+.Ic fi
+.Ed
.Pp
The syntax of the
.Ic while
command is:
-.Dl Ic while Ar list
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic while Ar list
+.Ic do Ar list
+.Ic done
+.Ed
.Pp
The two lists are executed repeatedly while the exit status of the
first list is zero.
@@ -804,9 +843,11 @@
The syntax of the
.Ic for
command is:
-.Dl Ic for Ar variable Op Ic in Ar word ...
-.Dl Ic do Ar list
-.Dl Ic done
+.Bd -unfilled -offset indent -compact
+.Ic for Ar variable Op Ic in Ar word ...
+.Ic do Ar list
+.Ic done
+.Ed
.Pp
If
.Ic in
@@ -820,17 +861,17 @@
and
.Ic done
commands may be replaced with
-.Dq Li {
+.Ql {
and
-.Dq Li } .
+.Ql } .
.Pp
The syntax of the
.Ic break
and
.Ic continue
commands is:
-.Dl Ic break Op Ar num
-.Dl Ic continue Op Ar num
+.D1 Ic break Op Ar num
+.D1 Ic continue Op Ar num
.Pp
The
.Ic break
@@ -848,18 +889,20 @@
.Pp
The syntax of the
.Ic case
-command is
-.Dl Ic case Ar word Ic in
-.Dl pattern) list ;;
-.Dl ...
-.Dl Ic esac
+command is:
+.Bd -unfilled -offset indent -compact
+.Ic case Ar word Ic in
+.Ar pattern Ns Li ) Ar list Li ;;
+.Ar ...
+.Ic esac
+.Ed
.Pp
The pattern can actually be one or more patterns
(see
.Sx Shell Patterns
described later),
separated by
-.Dq Li \&|
+.Ql \&|
characters.
The exit code of the
.Ic case
@@ -867,14 +910,12 @@
zero if no patterns were matched.
.Ss Grouping Commands Together
Commands may be grouped by writing either
-.Bd -literal -offset indent
-(list)
-.Ed
+.Pp
+.D1 Li \&( Ns Ar list Ns Li \%)
.Pp
or
-.Bd -literal -offset indent
-{ list; }
-.Ed
+.Pp
+.D1 Li { Ar list Ns Li \&; }
.Pp
The first form executes the commands in a subshell.
Note that built-in commands thus executed do not affect the current shell.
@@ -887,18 +928,21 @@
.Ed
.Ss Functions
The syntax of a function definition is
-.Bd -literal -offset indent
-name ( ) command
-.Ed
+.Pp
+.D1 Ar name Li \&( \&) Ar command
.Pp
A function definition is an executable statement; when
-executed it installs a function named name and returns an
+executed it installs a function named
+.Ar name
+and returns an
exit status of zero.
-The command is normally a list
+The
+.Ar command
+is normally a list
enclosed between
-.Dq Li {
+.Ql {
and
-.Dq Li } .
+.Ql } .
.Pp
Variables may be declared to be local to a function by
using the
@@ -906,11 +950,8 @@
command.
This should appear as the first statement of a function,
and the syntax is:
-.Bd -ragged -offset indent
-.Ic local
-.Op Ar variable ...
-.Op Fl
-.Ed
+.Pp
+.D1 Ic local Oo Ar variable ... Oc Op Fl
.Pp
The
.Ic local
@@ -923,38 +964,38 @@
Otherwise, the variable is initially unset.
The shell
uses dynamic scoping, so that if the variable
-.Em x
+.Va x
is made local to function
.Em f ,
which then calls function
.Em g ,
references to the variable
-.Em x
+.Va x
made inside
.Em g
will refer to the variable
-.Em x
+.Va x
declared inside
.Em f ,
not to the global variable named
-.Em x .
+.Va x .
.Pp
The only special parameter that can be made local is
-.Dq Li - .
+.Ql - .
Making
-.Dq Li -
+.Ql -
local causes any shell options that are
-changed via the set command inside the function to be
+changed via the
+.Ic set
+command inside the function to be
restored to their original values when the function
returns.
.Pp
The syntax of the
.Ic return
command is
-.Bd -ragged -offset indent
-.Ic return
-.Op Ar exitstatus
-.Ed
+.Pp
+.D1 Ic return Op Ar exitstatus
.Pp
It terminates the current executional scope, returning from the previous
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list