PERFORCE change 129587 for review
Peter Wemm
peter at FreeBSD.org
Mon Nov 26 13:47:01 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=129587
Change 129587 by peter at peter_daintree on 2007/11/26 21:46:44
IFC @129585
Affected files ...
.. //depot/projects/hammer/ObsoleteFiles.inc#40 integrate
.. //depot/projects/hammer/UPDATING#110 integrate
.. //depot/projects/hammer/bin/ln/ln.1#8 integrate
.. //depot/projects/hammer/bin/ln/ln.c#7 integrate
.. //depot/projects/hammer/bin/sh/Makefile#9 integrate
.. //depot/projects/hammer/contrib/binutils/opcodes/ppc-dis.c#4 integrate
.. //depot/projects/hammer/contrib/csup/mux.c#2 integrate
.. //depot/projects/hammer/contrib/gdb/gdb/i386fbsd-nat.c#3 integrate
.. //depot/projects/hammer/contrib/less/LICENSE#4 integrate
.. //depot/projects/hammer/contrib/less/Makefile.dsm#2 delete
.. //depot/projects/hammer/contrib/less/NEWS#7 integrate
.. //depot/projects/hammer/contrib/less/README#7 integrate
.. //depot/projects/hammer/contrib/less/ch.c#6 integrate
.. //depot/projects/hammer/contrib/less/command.c#6 integrate
.. //depot/projects/hammer/contrib/less/configure#6 integrate
.. //depot/projects/hammer/contrib/less/configure.ac#5 integrate
.. //depot/projects/hammer/contrib/less/decode.c#5 integrate
.. //depot/projects/hammer/contrib/less/defines.ds#5 integrate
.. //depot/projects/hammer/contrib/less/defines.h.in#5 integrate
.. //depot/projects/hammer/contrib/less/defines.o2#5 integrate
.. //depot/projects/hammer/contrib/less/defines.o9#4 integrate
.. //depot/projects/hammer/contrib/less/defines.wn#5 integrate
.. //depot/projects/hammer/contrib/less/edit.c#5 integrate
.. //depot/projects/hammer/contrib/less/filename.c#6 integrate
.. //depot/projects/hammer/contrib/less/funcs.h#6 integrate
.. //depot/projects/hammer/contrib/less/less.h#6 integrate
.. //depot/projects/hammer/contrib/less/less.man#7 integrate
.. //depot/projects/hammer/contrib/less/less.nro#7 integrate
.. //depot/projects/hammer/contrib/less/lessecho.man#5 integrate
.. //depot/projects/hammer/contrib/less/lessecho.nro#5 integrate
.. //depot/projects/hammer/contrib/less/lesskey.man#7 integrate
.. //depot/projects/hammer/contrib/less/lesskey.nro#7 integrate
.. //depot/projects/hammer/contrib/less/line.c#7 integrate
.. //depot/projects/hammer/contrib/less/optfunc.c#6 integrate
.. //depot/projects/hammer/contrib/less/opttbl.c#5 integrate
.. //depot/projects/hammer/contrib/less/screen.c#7 integrate
.. //depot/projects/hammer/contrib/less/search.c#7 integrate
.. //depot/projects/hammer/contrib/less/tags.c#5 integrate
.. //depot/projects/hammer/contrib/less/version.c#7 integrate
.. //depot/projects/hammer/contrib/tcpdump/tcpdump.c#8 integrate
.. //depot/projects/hammer/etc/etc.amd64/ttys#6 integrate
.. //depot/projects/hammer/etc/etc.arm/ttys#5 integrate
.. //depot/projects/hammer/etc/etc.i386/ttys#4 integrate
.. //depot/projects/hammer/etc/etc.ia64/ttys#6 integrate
.. //depot/projects/hammer/etc/etc.powerpc/ttys#6 integrate
.. //depot/projects/hammer/etc/etc.sparc64/ttys#13 integrate
.. //depot/projects/hammer/etc/periodic/security/100.chksetuid#6 integrate
.. //depot/projects/hammer/gnu/lib/libobjc/Makefile#19 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#23 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.h#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kthr.c#7 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_i386.c#5 integrate
.. //depot/projects/hammer/include/dirent.h#5 integrate
.. //depot/projects/hammer/kerberos5/lib/Makefile.inc#8 integrate
.. //depot/projects/hammer/lib/Makefile#65 integrate
.. //depot/projects/hammer/lib/libc/gdtoa/_ldtoa.c#3 integrate
.. //depot/projects/hammer/lib/libc/gen/closedir.c#3 integrate
.. //depot/projects/hammer/lib/libc/net/Makefile.inc#20 integrate
.. //depot/projects/hammer/lib/libc/rpc/authdes_prot.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/authunix_prot.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/key_prot_xdr.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_callmsg.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_prot.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpcb_prot.c#5 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpcb_st_xdr.c#2 integrate
.. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_explode.c#4 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.3#12 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.h#16 integrate
.. //depot/projects/hammer/lib/libelf/elf.3#3 integrate
.. //depot/projects/hammer/lib/libelf/gelf_xlatetof.3#2 integrate
.. //depot/projects/hammer/lib/libelf/libelf_data.c#2 integrate
.. //depot/projects/hammer/lib/libelf/libelf_xlate.c#2 integrate
.. //depot/projects/hammer/lib/libgssapi/Makefile#2 integrate
.. //depot/projects/hammer/lib/libkse/Makefile#2 integrate
.. //depot/projects/hammer/lib/libkse/thread/thr_spec.c#2 integrate
.. //depot/projects/hammer/lib/libpmc/Makefile#4 integrate
.. //depot/projects/hammer/lib/libpmc/pmc.3#12 integrate
.. //depot/projects/hammer/lib/libpmc/pmc_allocate.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_attach.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_capabilities.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_configure_logfile.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_disable.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_event_names_of_class.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_get_driver_stats.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_get_msr.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_init.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_name_of_capability.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_read.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_set.3#1 branch
.. //depot/projects/hammer/lib/libpmc/pmc_start.3#1 branch
.. //depot/projects/hammer/lib/libsdp/search.c#5 integrate
.. //depot/projects/hammer/lib/libthr/Makefile#24 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#35 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#37 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#15 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_umtx.h#5 integrate
.. //depot/projects/hammer/lib/libthread_db/arch/arm/libpthread_md.c#1 branch
.. //depot/projects/hammer/lib/libutil/expand_number.3#3 integrate
.. //depot/projects/hammer/lib/libutil/expand_number.c#2 integrate
.. //depot/projects/hammer/lib/libutil/libutil.h#9 integrate
.. //depot/projects/hammer/lib/libutil/pty.c#6 integrate
.. //depot/projects/hammer/libexec/rtld-elf/powerpc/reloc.c#9 integrate
.. //depot/projects/hammer/libexec/tftpd/Makefile#2 integrate
.. //depot/projects/hammer/libexec/tftpd/tftpd.8#6 integrate
.. //depot/projects/hammer/libexec/tftpd/tftpd.c#12 integrate
.. //depot/projects/hammer/release/Makefile#96 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#25 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/msg/msg.c#2 integrate
.. //depot/projects/hammer/sbin/clri/clri.c#7 integrate
.. //depot/projects/hammer/sbin/devd/Makefile#9 integrate
.. //depot/projects/hammer/sbin/geom/class/journal/gjournal.8#2 integrate
.. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#13 integrate
.. //depot/projects/hammer/sbin/geom/class/virstor/geom_virstor.c#2 integrate
.. //depot/projects/hammer/sbin/init/init.c#12 integrate
.. //depot/projects/hammer/sbin/ipf/ipftest/Makefile#3 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#62 integrate
.. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#26 integrate
.. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.8#6 integrate
.. //depot/projects/hammer/sbin/ping6/ping6.8#6 integrate
.. //depot/projects/hammer/sbin/ping6/ping6.c#11 integrate
.. //depot/projects/hammer/sbin/spppcontrol/spppcontrol.c#3 integrate
.. //depot/projects/hammer/share/colldef/sv_SE.ISO8859-1.src#2 integrate
.. //depot/projects/hammer/share/colldef/sv_SE.ISO8859-15.src#2 integrate
.. //depot/projects/hammer/share/man/man4/hwpmc.4#16 integrate
.. //depot/projects/hammer/share/man/man4/msk.4#4 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#74 integrate
.. //depot/projects/hammer/share/man/man9/rwlock.9#6 integrate
.. //depot/projects/hammer/share/man/man9/sx.9#16 integrate
.. //depot/projects/hammer/share/man/man9/timeout.9#14 integrate
.. //depot/projects/hammer/share/mk/bsd.sys.mk#16 integrate
.. //depot/projects/hammer/share/mk/sys.mk#26 integrate
.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#39 integrate
.. //depot/projects/hammer/sys/amd64/amd64/exception.S#47 integrate
.. //depot/projects/hammer/sys/amd64/amd64/genassym.c#48 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#51 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#162 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#165 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#100 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#44 integrate
.. //depot/projects/hammer/sys/arm/conf/HL200#1 branch
.. //depot/projects/hammer/sys/boot/i386/cdboot/cdboot.s#7 integrate
.. //depot/projects/hammer/sys/boot/i386/gptboot/gptldr.S#2 integrate
.. //depot/projects/hammer/sys/boot/i386/pmbr/pmbr.s#2 integrate
.. //depot/projects/hammer/sys/boot/pc98/cdboot/cdboot.s#3 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_all.h#10 integrate
.. //depot/projects/hammer/sys/conf/files#164 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#66 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#19 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_auth.c#13 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#35 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#11 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#26 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_debug.c#10 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#19 integrate
.. //depot/projects/hammer/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/hammer/sys/dev/an/if_an.c#37 integrate
.. //depot/projects/hammer/sys/dev/an/if_anreg.h#9 integrate
.. //depot/projects/hammer/sys/dev/asmc/asmc.c#2 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#45 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#82 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#45 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#29 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#44 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#50 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#39 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#22 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#22 integrate
.. //depot/projects/hammer/sys/dev/bce/if_bce.c#10 integrate
.. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#29 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#76 integrate
.. //depot/projects/hammer/sys/dev/dc/dcphy.c#5 integrate
.. //depot/projects/hammer/sys/dev/dc/if_dc.c#13 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_80003es2lan.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_80003es2lan.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82540.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82541.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82541.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82542.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82543.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82543.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82571.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82571.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82575.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82575.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_api.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_api.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_defines.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_hw.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_mac.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_mac.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_manage.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_manage.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_nvm.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_nvm.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_osdep.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_phy.c#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_phy.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_regs.h#3 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#70 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.h#34 integrate
.. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#11 integrate
.. //depot/projects/hammer/sys/dev/ichwd/ichwd.h#5 integrate
.. //depot/projects/hammer/sys/dev/lge/if_lge.c#35 integrate
.. //depot/projects/hammer/sys/dev/mii/amphy.c#12 integrate
.. //depot/projects/hammer/sys/dev/mii/e1000phy.c#12 integrate
.. //depot/projects/hammer/sys/dev/mii/nsphy.c#12 integrate
.. //depot/projects/hammer/sys/dev/mii/rlphy.c#15 integrate
.. //depot/projects/hammer/sys/dev/mii/tdkphy.c#12 integrate
.. //depot/projects/hammer/sys/dev/mii/ukphy_subr.c#6 integrate
.. //depot/projects/hammer/sys/dev/msk/if_msk.c#8 integrate
.. //depot/projects/hammer/sys/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#8 integrate
.. //depot/projects/hammer/sys/dev/nge/if_nge.c#42 integrate
.. //depot/projects/hammer/sys/dev/nve/if_nve.c#22 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#64 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#52 integrate
.. //depot/projects/hammer/sys/dev/sk/if_sk.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#11 integrate
.. //depot/projects/hammer/sys/dev/stge/if_stge.c#5 integrate
.. //depot/projects/hammer/sys/dev/ti/if_ti.c#7 integrate
.. //depot/projects/hammer/sys/dev/txp/if_txp.c#29 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#25 integrate
.. //depot/projects/hammer/sys/dev/usb/if_rum.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zyd.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#17 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#91 integrate
.. //depot/projects/hammer/sys/dev/vge/if_vge.c#19 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#14 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#48 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#33 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#6 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#6 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#9 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/hammer/sys/geom/eli/g_eli_crypto.c#6 integrate
.. //depot/projects/hammer/sys/geom/label/g_label_reiserfs.c#3 integrate
.. //depot/projects/hammer/sys/i386/i386/genassym.c#22 integrate
.. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#25 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#101 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#28 integrate
.. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#28 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#63 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#49 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#68 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#40 integrate
.. //depot/projects/hammer/sys/kern/kern_kthread.c#15 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_lock.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_mutex.c#50 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#61 integrate
.. //depot/projects/hammer/sys/kern/kern_rmlock.c#2 integrate
.. //depot/projects/hammer/sys/kern/kern_rwlock.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_sx.c#19 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#40 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#101 integrate
.. //depot/projects/hammer/sys/kern/kern_timeout.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_umtx.c#28 integrate
.. //depot/projects/hammer/sys/kern/linker_if.m#4 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#66 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#36 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#36 integrate
.. //depot/projects/hammer/sys/kern/vfs_cache.c#24 integrate
.. //depot/projects/hammer/sys/net/ieee8023ad_lacp.c#6 integrate
.. //depot/projects/hammer/sys/net/if_lagg.c#10 integrate
.. //depot/projects/hammer/sys/net/pfil.c#10 integrate
.. //depot/projects/hammer/sys/net/pfil.h#8 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.c#31 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.h#16 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#6 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.c#44 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_output.c#33 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#32 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#6 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_var.h#32 integrate
.. //depot/projects/hammer/sys/netatalk/aarp.c#22 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_output.c#15 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#45 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_util.c#6 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#46 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#78 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#52 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#45 integrate
.. //depot/projects/hammer/sys/netipsec/keysock.c#16 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#54 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#58 integrate
.. //depot/projects/hammer/sys/pci/if_rlreg.h#28 integrate
.. //depot/projects/hammer/sys/pci/if_sf.c#43 integrate
.. //depot/projects/hammer/sys/pci/if_ste.c#48 integrate
.. //depot/projects/hammer/sys/pci/if_vr.c#46 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#68 integrate
.. //depot/projects/hammer/sys/powerpc/include/atomic.h#10 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#14 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/mmu_if.m#7 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/mmu_oea.c#5 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap_dispatch.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/conf/DEFAULTS#5 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#16 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#48 integrate
.. //depot/projects/hammer/sys/sun4v/include/stdarg.h#2 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/pmap.c#5 integrate
.. //depot/projects/hammer/sys/sys/callout.h#9 integrate
.. //depot/projects/hammer/sys/sys/eventhandler.h#11 integrate
.. //depot/projects/hammer/sys/sys/linker.h#19 integrate
.. //depot/projects/hammer/sys/sys/lock.h#21 integrate
.. //depot/projects/hammer/sys/sys/lockmgr.h#13 integrate
.. //depot/projects/hammer/sys/sys/mutex.h#34 integrate
.. //depot/projects/hammer/sys/sys/umtx.h#16 integrate
.. //depot/projects/hammer/sys/vm/pmap.h#30 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#37 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#70 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#64 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#47 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.h#11 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#42 integrate
.. //depot/projects/hammer/tools/regression/priv/Makefile#4 integrate
.. //depot/projects/hammer/tools/regression/priv/main.c#4 integrate
.. //depot/projects/hammer/tools/regression/priv/main.h#4 integrate
.. //depot/projects/hammer/tools/regression/priv/priv_netinet_ipsec.c#2 integrate
.. //depot/projects/hammer/tools/sched/schedgraph.py#9 integrate
.. //depot/projects/hammer/usr.bin/fstat/zfs/zfs.c#2 integrate
.. //depot/projects/hammer/usr.bin/less/defines.h#5 integrate
.. //depot/projects/hammer/usr.bin/lsvfs/lsvfs.c#4 integrate
.. //depot/projects/hammer/usr.bin/make/main.c#42 integrate
.. //depot/projects/hammer/usr.bin/netstat/Makefile#16 integrate
.. //depot/projects/hammer/usr.bin/rpcgen/rpc_cout.c#7 integrate
.. //depot/projects/hammer/usr.bin/tail/read.c#6 integrate
.. //depot/projects/hammer/usr.bin/tip/tip/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/IPXrouted/trace.c#5 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidb/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi.c#16 integrate
.. //depot/projects/hammer/usr.sbin/arp/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/freebsd-update/freebsd-update.sh#6 integrate
.. //depot/projects/hammer/usr.sbin/kldxref/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/nscd/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/chap.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/physical.h#4 integrate
.. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/sa/db.c#2 integrate
Differences ...
==== //depot/projects/hammer/ObsoleteFiles.inc#40 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.120 2007/11/21 10:49:33 ru Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -16,6 +16,12 @@
# 20071108: Removed very crunch OLDCARD support file
OLD_FILES+=etc/defaults/pccard.conf
+# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64.
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=rescue/bsdlabel
+OLD_FILES+=rescue/fdisk
+OLD_FILES+=rescue/gpt
+.endif
# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
OLD_FILES+=etc/rc.d/nfslocking
# 20070930: rename of cached to nscd
@@ -198,7 +204,7 @@
# 20070605: sched_core removal
OLD_FILES+=usr/share/man/man4/sched_core.4.gz
# 20070603: BIND 9.4.1 import
-OLD_LIBS+=lib/liblwres.so.10
+OLD_LIBS+=usr/lib/liblwres.so.10
# 20070521: shared library version bump
OLD_LIBS+=lib/libatm.so.4
OLD_LIBS+=lib/libbegemot.so.2
@@ -3957,6 +3963,20 @@
# - usr/share/tmac/mm/locale
# - usr/share/tmac/mm/se_locale
# - var/yp/Makefile
+
+# 20071119: shared library version bump
+OLD_LIBS+=usr/lib/libasn1.so.8
+OLD_LIBS+=usr/lib/libgssapi.so.8
+OLD_LIBS+=usr/lib/libhdb.so.8
+OLD_LIBS+=usr/lib/libkadm5clnt.so.8
+OLD_LIBS+=usr/lib/libkadm5srv.so.8
+OLD_LIBS+=usr/lib/libkafs5.so.8
+OLD_LIBS+=usr/lib/libkrb5.so.8
+OLD_LIBS+=usr/lib/libobjc.so.2
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libgssapi.so.8
+OLD_LIBS+=usr/lib32/libobjc.so.2
+.endif
# 20070519: GCC 4.2
OLD_LIBS+=usr/lib/libg2c.a
OLD_LIBS+=usr/lib/libg2c.so
==== //depot/projects/hammer/UPDATING#110 (text+ko) ====
@@ -21,6 +21,17 @@
developers choose to disable these features on build machines
to maximize performance.
+20071118:
+ The AT keyboard emulation of sunkbd(4) has been turned on
+ by default. In order to make the special symbols of the Sun
+ keyboards driven by sunkbd(4) work under X these now have
+ to be configured the same way as Sun USB keyboards driven
+ by ukbd(4) (which also does AT keyboard emulation), f.e.:
+
+ Option "XkbLayout" "us"
+ Option "XkbRules" "xorg"
+ Option "XkbSymbols" "pc(pc105)+sun_vndr/usb(sun_usb)+us"
+
20071024:
It has been decided that it is desirable to provide ABI
backwards compatibility to the FreeBSD 4/5/6 versions of the
@@ -934,4 +945,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $
+$FreeBSD: src/UPDATING,v 1.512 2007/11/18 18:11:16 marius Exp $
==== //depot/projects/hammer/bin/ln/ln.1#8 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ln.1 8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.32 2007/11/17 21:01:22 ru Exp $
.\"
.Dd February 14, 2006
.Dt LN 1
@@ -41,11 +41,15 @@
.Nd make links
.Sh SYNOPSIS
.Nm
-.Op Fl Ffhinsv
+.Op Fl s Op Fl F
+.Op Fl f | i
+.Op Fl hnv
.Ar source_file
.Op Ar target_file
.Nm
-.Op Fl Ffhinsv
+.Op Fl s Op Fl F
+.Op Fl f | i
+.Op Fl hnv
.Ar source_file ...
.Ar target_dir
.Nm link
==== //depot/projects/hammer/bin/ln/ln.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $");
+__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.36 2007/11/17 21:01:22 ru Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -69,7 +69,7 @@
main(int argc, char *argv[])
{
struct stat sb;
- char *p, *sourcedir;
+ char *p, *targetdir;
int ch, exitval;
/*
@@ -134,34 +134,34 @@
case 0:
usage();
/* NOTREACHED */
- case 1: /* ln target */
+ case 1: /* ln source */
exit(linkit(argv[0], ".", 1));
- case 2: /* ln target source */
+ case 2: /* ln source target */
exit(linkit(argv[0], argv[1], 0));
default:
;
}
- /* ln target1 target2 directory */
- sourcedir = argv[argc - 1];
- if (hflag && lstat(sourcedir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
+ /* ln source1 source2 directory */
+ targetdir = argv[argc - 1];
+ if (hflag && lstat(targetdir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
/*
* We were asked not to follow symlinks, but found one at
* the target--simulate "not a directory" error
*/
errno = ENOTDIR;
- err(1, "%s", sourcedir);
+ err(1, "%s", targetdir);
}
- if (stat(sourcedir, &sb))
- err(1, "%s", sourcedir);
+ if (stat(targetdir, &sb))
+ err(1, "%s", targetdir);
if (!S_ISDIR(sb.st_mode))
usage();
- for (exitval = 0; *argv != sourcedir; ++argv)
- exitval |= linkit(*argv, sourcedir, 1);
+ for (exitval = 0; *argv != targetdir; ++argv)
+ exitval |= linkit(*argv, targetdir, 1);
exit(exitval);
}
int
-linkit(const char *target, const char *source, int isdir)
+linkit(const char *source, const char *target, int isdir)
{
struct stat sb;
const char *p;
@@ -169,57 +169,57 @@
char path[PATH_MAX];
if (!sflag) {
- /* If target doesn't exist, quit now. */
- if (stat(target, &sb)) {
- warn("%s", target);
+ /* If source doesn't exist, quit now. */
+ if (stat(source, &sb)) {
+ warn("%s", source);
return (1);
}
/* Only symbolic links to directories. */
if (S_ISDIR(sb.st_mode)) {
errno = EISDIR;
- warn("%s", target);
+ warn("%s", source);
return (1);
}
}
/*
- * If the source is a directory (and not a symlink if hflag),
- * append the target's name.
+ * If the target is a directory (and not a symlink if hflag),
+ * append the source's name.
*/
if (isdir ||
- (lstat(source, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
- (!hflag && stat(source, &sb) == 0 && S_ISDIR(sb.st_mode))) {
- if ((p = strrchr(target, '/')) == NULL)
- p = target;
+ (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
+ (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) {
+ if ((p = strrchr(source, '/')) == NULL)
+ p = source;
else
++p;
- if (snprintf(path, sizeof(path), "%s/%s", source, p) >=
+ if (snprintf(path, sizeof(path), "%s/%s", target, p) >=
(ssize_t)sizeof(path)) {
errno = ENAMETOOLONG;
- warn("%s", target);
+ warn("%s", source);
return (1);
}
- source = path;
+ target = path;
}
- exists = !lstat(source, &sb);
+ exists = !lstat(target, &sb);
/*
* If the file exists, then unlink it forcibly if -f was specified
* and interactively if -i was specified.
*/
if (fflag && exists) {
if (Fflag && S_ISDIR(sb.st_mode)) {
- if (rmdir(source)) {
- warn("%s", source);
+ if (rmdir(target)) {
+ warn("%s", target);
return (1);
}
- } else if (unlink(source)) {
- warn("%s", source);
+ } else if (unlink(target)) {
+ warn("%s", target);
return (1);
}
} else if (iflag && exists) {
fflush(stdout);
- fprintf(stderr, "replace %s? ", source);
+ fprintf(stderr, "replace %s? ", target);
first = ch = getchar();
while(ch != '\n' && ch != EOF)
@@ -230,23 +230,23 @@
}
if (Fflag && S_ISDIR(sb.st_mode)) {
- if (rmdir(source)) {
- warn("%s", source);
+ if (rmdir(target)) {
+ warn("%s", target);
return (1);
}
- } else if (unlink(source)) {
- warn("%s", source);
+ } else if (unlink(target)) {
+ warn("%s", target);
return (1);
}
}
/* Attempt the link. */
- if ((*linkf)(target, source)) {
- warn("%s", source);
+ if ((*linkf)(source, target)) {
+ warn("%s", target);
return (1);
}
if (vflag)
- (void)printf("%s %c> %s\n", source, linkch, target);
+ (void)printf("%s %c> %s\n", target, linkch, source);
return (0);
}
@@ -254,8 +254,8 @@
usage(void)
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
- "usage: ln [-Ffhinsv] source_file [target_file]",
- " ln [-Ffhinsv] source_file ... target_dir",
+ "usage: ln [-s [-F]] [-f | -i] [-hnv] source_file [target_file]",
+ " ln [-s [-F]] [-f | -i] [-hnv] source_file ... target_dir",
" link source_file target_file");
exit(1);
}
==== //depot/projects/hammer/bin/sh/Makefile#9 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.4 (Berkeley) 5/5/95
-# $FreeBSD: src/bin/sh/Makefile,v 1.46 2006/04/17 17:55:11 schweikh Exp $
+# $FreeBSD: src/bin/sh/Makefile,v 1.47 2007/11/18 01:53:07 jb Exp $
PROG= sh
INSTALLFLAGS= -S
@@ -22,7 +22,7 @@
CFLAGS+=-DSHELL -I. -I${.CURDIR}
# for debug:
# CFLAGS+= -g -DDEBUG=2
-WARNS?= 3
+WARNS?= 2
WFORMAT=0
.PATH: ${.CURDIR}/bltin \
==== //depot/projects/hammer/contrib/binutils/opcodes/ppc-dis.c#4 (text+ko) ====
@@ -1,3 +1,4 @@
+/* $FreeBSD: src/contrib/binutils/opcodes/ppc-dis.c,v 1.2 2007/11/23 23:54:44 jb Exp $ */
/* ppc-dis.c -- Disassemble PowerPC instructions
Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
@@ -45,6 +46,7 @@
powerpc_dialect (struct disassemble_info *info)
{
int dialect = PPC_OPCODE_PPC | PPC_OPCODE_ALTIVEC;
+ void *pd = &info->private_data;
if (BFD_DEFAULT_TARGET_SIZE == 64)
dialect |= PPC_OPCODE_64;
@@ -91,7 +93,7 @@
dialect |= PPC_OPCODE_64;
}
- ((struct dis_private *) &info->private_data)->dialect = dialect;
+ ((struct dis_private *) pd)->dialect = dialect;
return dialect;
}
@@ -100,7 +102,8 @@
int
print_insn_big_powerpc (bfd_vma memaddr, struct disassemble_info *info)
{
- int dialect = ((struct dis_private *) &info->private_data)->dialect;
+ void *pd = &info->private_data;
+ int dialect = ((struct dis_private *) pd)->dialect;
return print_insn_powerpc (memaddr, info, 1, dialect);
}
@@ -109,7 +112,8 @@
int
print_insn_little_powerpc (bfd_vma memaddr, struct disassemble_info *info)
{
- int dialect = ((struct dis_private *) &info->private_data)->dialect;
+ void *pd = &info->private_data;
+ int dialect = ((struct dis_private *) pd)->dialect;
return print_insn_powerpc (memaddr, info, 0, dialect);
}
==== //depot/projects/hammer/contrib/csup/mux.c#2 (text) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/csup/mux.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
+ * $FreeBSD: src/contrib/csup/mux.c,v 1.2 2007/11/18 00:25:18 jb Exp $
*/
#include <sys/param.h>
@@ -782,7 +782,7 @@
struct buf *buf;
uint32_t winsize;
uint16_t hdrsize, size, len;
- int error, id, iovcnt, what;
+ int error, id, iovcnt, what = 0;
m = (struct mux *)arg;
again:
==== //depot/projects/hammer/contrib/gdb/gdb/i386fbsd-nat.c#3 (text+ko) ====
@@ -91,7 +91,7 @@
#ifdef KERN_PS_STRINGS
{
int mib[2];
- int ps_strings;
+ u_long ps_strings;
size_t len;
mib[0] = CTL_KERN;
==== //depot/projects/hammer/contrib/less/LICENSE#4 (text+ko) ====
@@ -2,7 +2,7 @@
------------
Less
-Copyright (C) 1984-2005 Mark Nudelman
+Copyright (C) 1984-2007 Mark Nudelman
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
==== //depot/projects/hammer/contrib/less/NEWS#7 (text+ko) ====
@@ -13,6 +13,17 @@
======================================================================
+ Major changes between "less" versions 409 and 416
+
+* New --follow-name option makes F command follow the name of a file
+ rather than the file descriptor if an open file is renamed.
+
+* Make searching with -i/-I work correctly with non-ASCII text.
+
+* Fix DJGPP build.
+
+======================================================================
+
Major changes between "less" versions 406 and 409
* Support CSI escape sequences, like SGR escape sequences.
@@ -698,3 +709,4 @@
+
==== //depot/projects/hammer/contrib/less/README#7 (text+ko) ====
@@ -1,7 +1,7 @@
- Less, version 409
+ Less, version 416
- This is the distribution of less, version 409, released 12 Oct 2007.
+ This is the distribution of less, version 416, released 22 Nov 2007.
This program is part of the GNU project (http://www.gnu.org).
This program is free software. You may redistribute it and/or
==== //depot/projects/hammer/contrib/less/ch.c#6 (text+ko) ====
@@ -21,6 +21,12 @@
#include <windows.h>
#endif
+#if HAVE_STAT_INO
+#include <sys/stat.h>
+extern dev_t curr_dev;
+extern ino_t curr_ino;
+#endif
+
typedef POSITION BLOCKNUM;
public int ignore_eoi;
@@ -98,6 +104,8 @@
extern int autobuf;
extern int sigs;
extern int secure;
+extern int screen_trashed;
+extern int follow_mode;
extern constant char helpdata[];
extern constant int size_helpdata;
extern IFILE curr_ifile;
@@ -195,7 +203,7 @@
*/
if (!(ch_flags & CH_CANSEEK))
return ('?');
- if (lseek(ch_file, (off_t)pos, 0) == BAD_LSEEK)
+ if (lseek(ch_file, (off_t)pos, SEEK_SET) == BAD_LSEEK)
{
error("seek error", NULL_PARG);
clear_eol();
@@ -276,6 +284,25 @@
#endif
#endif
slept = TRUE;
+
+#if HAVE_STAT_INO
+ if (follow_mode == FOLLOW_NAME)
+ {
+ /* See whether the file's i-number has changed.
+ * If so, force the file to be closed and
+ * reopened. */
+ struct stat st;
+ int r = stat(get_filename(curr_ifile), &st);
+ if (r == 0 && (st.st_ino != curr_ino ||
+ st.st_dev != curr_dev))
+ {
+ /* screen_trashed=2 causes
+ * make_display to reopen the file. */
+ screen_trashed = 2;
+ return (EOI);
+ }
+ }
+#endif
}
if (sigs)
return (EOI);
@@ -648,7 +675,7 @@
}
#endif
- if (lseek(ch_file, (off_t)0, 0) == BAD_LSEEK)
+ if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK)
{
/*
* Warning only; even if the seek fails for some reason,
@@ -711,7 +738,7 @@
while (ch_bufhead != END_OF_CHAIN)
{
bp = ch_bufhead;
- bp->next->prev = bp->prev;;
+ bp->next->prev = bp->prev;
bp->prev->next = bp->next;
free(bp);
}
@@ -737,7 +764,7 @@
return (0);
}
#endif
- return (lseek(f, (off_t)1, 0) != BAD_LSEEK);
+ return (lseek(f, (off_t)1, SEEK_SET) != BAD_LSEEK);
}
/*
==== //depot/projects/hammer/contrib/less/command.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/less/command.c,v 1.8 2007/06/21 10:44:50 delphij Exp $ */
+/* $FreeBSD: src/contrib/less/command.c,v 1.9 2007/11/16 22:24:31 delphij Exp $ */
/*
* Copyright (C) 1984-2007 Mark Nudelman
*
@@ -558,6 +558,21 @@
}
/*
+ * Discard any buffered file data.
+ */
+ static void
+clear_buffers()
+{
+ if (!(ch_getflags() & CH_CANSEEK))
+ return;
+ ch_flush();
+ clr_linenum();
+#if HILITE_SEARCH
+ clr_hilite();
+#endif
+}
+
+/*
* Make sure the screen is displayed.
*/
static void
@@ -580,11 +595,20 @@
jump_loc(initial_scrpos.pos, initial_scrpos.ln);
} else if (screen_trashed)
{
- int save_top_scroll;
- save_top_scroll = top_scroll;
+ int save_top_scroll = top_scroll;
+ int save_ignore_eoi = ignore_eoi;
top_scroll = 1;
+ ignore_eoi = 0;
+ if (screen_trashed == 2)
+ {
+ /* Special case used by ignore_eoi: re-open the input file
+ * and jump to the end of the file. */
+ reopen_curr_ifile();
+ jump_forw();
+ }
repaint();
top_scroll = save_top_scroll;
+ ignore_eoi = save_ignore_eoi;
}
}
@@ -1115,7 +1139,10 @@
ignore_eoi = 1;
hit_eof = 0;
while (!sigs)
+ {
+ make_display();
forward(1, 0, 0);
+ }
ignore_eoi = 0;
/*
* This gets us back in "F mode" after processing
@@ -1154,14 +1181,7 @@
* Flush buffers, then repaint screen.
* Don't flush the buffers on a pipe!
*/
- if (ch_getflags() & CH_CANSEEK)
- {
- ch_flush();
- clr_linenum();
-#if HILITE_SEARCH
- clr_hilite();
-#endif
- }
+ clear_buffers();
/* FALLTHRU */
case A_REPAINT:
/*
@@ -1263,7 +1283,8 @@
/*
* Define abbreviation for a commonly used sequence below.
*/
-#define DO_SEARCH() if (number <= 0) number = 1; \
+#define DO_SEARCH() \
+ if (number <= 0) number = 1; \
mca_search(); \
cmd_exec(); \
multi_search((char *)NULL, (int) number);
==== //depot/projects/hammer/contrib/less/configure#6 (text+ko) ====
@@ -3611,6 +3611,73 @@
# Checks for general libraries.
+{ echo "$as_me:$LINENO: checking for tgoto in -ltinfo" >&5
+echo $ECHO_N "checking for tgoto in -ltinfo... $ECHO_C" >&6; }
+if test "${ac_cv_lib_tinfo_tgoto+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltinfo $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list