PERFORCE change 128993 for review
Kip Macy
kmacy at FreeBSD.org
Mon Nov 12 13:17:57 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=128993
Change 128993 by kmacy at freefall_kmacy_iwarp on 2007/11/12 21:16:51
IFethng 128992
Affected files ...
.. //depot/projects/iwarp/Makefile.inc1#3 integrate
.. //depot/projects/iwarp/ObsoleteFiles.inc#3 integrate
.. //depot/projects/iwarp/bin/mv/mv.1#2 integrate
.. //depot/projects/iwarp/bin/ps/keyword.c#3 integrate
.. //depot/projects/iwarp/bin/ps/ps.c#3 integrate
.. //depot/projects/iwarp/contrib/libreadline/FREEBSD-upgrade#2 integrate
.. //depot/projects/iwarp/contrib/libreadline/complete.c#2 integrate
.. //depot/projects/iwarp/contrib/libreadline/display.c#2 integrate
.. //depot/projects/iwarp/contrib/libreadline/input.c#2 integrate
.. //depot/projects/iwarp/contrib/libreadline/isearch.c#2 integrate
.. //depot/projects/iwarp/contrib/libreadline/misc.c#2 integrate
.. //depot/projects/iwarp/contrib/libreadline/readline.c#2 integrate
.. //depot/projects/iwarp/contrib/libreadline/text.c#2 integrate
.. //depot/projects/iwarp/contrib/libreadline/vi_mode.c#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/HISTORY#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/VERSION#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/aclocal.m4#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bin/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bin/audit/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bin/auditd/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bin/praudit/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bin/praudit/praudit.c#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/bsm/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/config/config.h#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/config/config.h.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/config/ltmain.sh#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/configure#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/configure.ac#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/etc/audit_class#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/etc/audit_event#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/libbsm/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/libbsm/bsm_event.c#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/libbsm/bsm_io.c#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/man/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/modules/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/test/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/test/bsm/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/openbsm/tools/Makefile.in#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/CACerts#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/FREEBSD-upgrade#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/INSTALL#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/RELEASE_NOTES#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/cf/cf/submit.cf#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/cf/m4/proto.m4#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/cf/m4/version.m4#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/contrib/buildvirtuser#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/doc/op/op.me#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/editmap/editmap.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/include/sm/conf.h#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/include/sm/ldap.h#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/include/sm/tailq.h#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/libmilter/engine.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/libmilter/listener.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/libmilter/main.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/libmilter/monitor.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/libmilter/smfi.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/libsm/ldap.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/libsm/mpeix.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/makemap/makemap.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/praliases/praliases.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/Makefile.m4#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/conf.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/deliver.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/envelope.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/headers.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/macro.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/main.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/map.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/milter.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/mime.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/parseaddr.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/queue.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/readcf.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/recipient.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/sendmail.8#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/sendmail.h#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/sm_resolve.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/srvrsmtp.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/usersmtp.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/util.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/src/version.c#2 integrate
.. //depot/projects/iwarp/contrib/sendmail/vacation/vacation.c#2 integrate
.. //depot/projects/iwarp/etc/Makefile#3 integrate
.. //depot/projects/iwarp/etc/defaults/Makefile#2 integrate
.. //depot/projects/iwarp/etc/defaults/pccard.conf#2 delete
.. //depot/projects/iwarp/etc/mtree/BSD.usr.dist#2 integrate
.. //depot/projects/iwarp/etc/namedb/named.root#2 integrate
.. //depot/projects/iwarp/etc/network.subr#2 integrate
.. //depot/projects/iwarp/etc/pf.conf#2 delete
.. //depot/projects/iwarp/etc/sendmail/freebsd.mc#2 integrate
.. //depot/projects/iwarp/etc/sendmail/freebsd.submit.mc#2 integrate
.. //depot/projects/iwarp/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/iwarp/games/fortune/fortune/fortune.6#2 integrate
.. //depot/projects/iwarp/games/fortune/fortune/fortune.c#2 integrate
.. //depot/projects/iwarp/include/_ctype.h#3 integrate
.. //depot/projects/iwarp/include/pthread.h#2 integrate
.. //depot/projects/iwarp/include/pthread_np.h#2 integrate
.. //depot/projects/iwarp/lib/libc/gen/valloc.3#2 integrate
.. //depot/projects/iwarp/lib/libc/locale/mblocal.h#2 integrate
.. //depot/projects/iwarp/lib/libc/net/ethers.3#2 integrate
.. //depot/projects/iwarp/lib/libc/sys/minherit.2#2 integrate
.. //depot/projects/iwarp/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate
.. //depot/projects/iwarp/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate
.. //depot/projects/iwarp/lib/libc/sys/sctp_peeloff.2#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_accept_sec_context.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_acquire_cred.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_add_cred.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_add_oid_set_member.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_canonicalize_name.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_compare_name.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_context_time.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_delete_sec_context.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_display_name.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_display_status.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_duplicate_name.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_export_name.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_export_sec_context.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_get_mic.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_import_name.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_import_sec_context.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_indicate_mechs.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_init_sec_context.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_inquire_context.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_inquire_cred.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_process_context_token.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_release_buffer.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_release_cred.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_release_name.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_release_oid_set.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_test_oid_set_member.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_unwrap.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_verify_mic.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_wrap.3#2 integrate
.. //depot/projects/iwarp/lib/libgssapi/gss_wrap_size_limit.3#2 integrate
.. //depot/projects/iwarp/lib/libkse/thread/thr_mutex.c#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_init.c#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_mutex.c#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_private.h#2 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_spec.c#2 integrate
.. //depot/projects/iwarp/libexec/Makefile#2 integrate
.. //depot/projects/iwarp/release/Makefile#2 integrate
.. //depot/projects/iwarp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate
.. //depot/projects/iwarp/release/scripts/package-split.py#2 integrate
.. //depot/projects/iwarp/release/scripts/src-install.sh#2 integrate
.. //depot/projects/iwarp/rescue/rescue/Makefile#3 integrate
.. //depot/projects/iwarp/sbin/geom/Makefile#2 integrate
.. //depot/projects/iwarp/sbin/geom/class/part/geom_part.c#3 integrate
.. //depot/projects/iwarp/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/iwarp/sbin/gpt/boot.c#2 integrate
.. //depot/projects/iwarp/sbin/gpt/gpt.c#3 integrate
.. //depot/projects/iwarp/sbin/ifconfig/ifbridge.c#2 integrate
.. //depot/projects/iwarp/sbin/ifconfig/ifconfig.8#2 integrate
.. //depot/projects/iwarp/sbin/ifconfig/ifieee80211.c#2 integrate
.. //depot/projects/iwarp/sbin/mdconfig/mdconfig.8#2 integrate
.. //depot/projects/iwarp/sbin/rcorder/ealloc.c#2 integrate
.. //depot/projects/iwarp/sbin/rcorder/ealloc.h#2 integrate
.. //depot/projects/iwarp/sbin/rcorder/hash.c#2 integrate
.. //depot/projects/iwarp/sbin/rcorder/hash.h#2 integrate
.. //depot/projects/iwarp/sbin/rcorder/rcorder.c#2 integrate
.. //depot/projects/iwarp/sbin/route/route.8#2 integrate
.. //depot/projects/iwarp/sbin/route/route.c#2 integrate
.. //depot/projects/iwarp/sbin/setkey/parse.y#2 integrate
.. //depot/projects/iwarp/sbin/setkey/setkey.c#2 integrate
.. //depot/projects/iwarp/sbin/setkey/test-pfkey.c#2 integrate
.. //depot/projects/iwarp/sbin/setkey/token.l#2 integrate
.. //depot/projects/iwarp/share/doc/legal/Makefile#2 integrate
.. //depot/projects/iwarp/share/doc/legal/intel_wpi/Makefile#1 branch
.. //depot/projects/iwarp/share/examples/pf/Makefile#2 integrate
.. //depot/projects/iwarp/share/examples/pf/ackpri#2 integrate
.. //depot/projects/iwarp/share/examples/pf/faq-example1#2 integrate
.. //depot/projects/iwarp/share/examples/pf/faq-example2#2 integrate
.. //depot/projects/iwarp/share/examples/pf/faq-example3#2 integrate
.. //depot/projects/iwarp/share/examples/pf/pf.conf#1 branch
.. //depot/projects/iwarp/share/examples/pf/queue1#2 integrate
.. //depot/projects/iwarp/share/examples/pf/queue2#2 integrate
.. //depot/projects/iwarp/share/examples/pf/queue3#2 integrate
.. //depot/projects/iwarp/share/examples/pf/queue4#2 integrate
.. //depot/projects/iwarp/share/examples/pf/spamd#2 integrate
.. //depot/projects/iwarp/share/man/man3/queue.3#2 integrate
.. //depot/projects/iwarp/share/man/man4/Makefile#3 integrate
.. //depot/projects/iwarp/share/man/man4/mac.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/md.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/ng_car.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/ng_netflow.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/nxge.4#2 integrate
.. //depot/projects/iwarp/share/man/man4/wpi.4#1 branch
.. //depot/projects/iwarp/share/man/man5/bluetooth.device.conf.5#2 integrate
.. //depot/projects/iwarp/share/man/man5/quota.user.5#2 integrate
.. //depot/projects/iwarp/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/iwarp/share/man/man5/xfs.5#2 integrate
.. //depot/projects/iwarp/share/man/man7/tuning.7#2 integrate
.. //depot/projects/iwarp/share/man/man9/Makefile#3 integrate
.. //depot/projects/iwarp/share/man/man9/locking.9#2 integrate
.. //depot/projects/iwarp/share/man/man9/rmlock.9#1 branch
.. //depot/projects/iwarp/share/man/man9/uio.9#2 integrate
.. //depot/projects/iwarp/share/misc/bsd-family-tree#2 integrate
.. //depot/projects/iwarp/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/iwarp/share/misc/pci_vendors#2 integrate
.. //depot/projects/iwarp/share/mk/sys.mk#3 integrate
.. //depot/projects/iwarp/share/zoneinfo/asia#2 integrate
.. //depot/projects/iwarp/share/zoneinfo/northamerica#2 integrate
.. //depot/projects/iwarp/share/zoneinfo/pacificnew#1 branch
.. //depot/projects/iwarp/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/iwarp/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/iwarp/sys/amd64/conf/DEFAULTS#3 integrate
.. //depot/projects/iwarp/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/iwarp/sys/amd64/include/pc/bios.h#2 integrate
.. //depot/projects/iwarp/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/iwarp/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/iwarp/sys/arm/at91/kb920x_machdep.c#3 integrate
.. //depot/projects/iwarp/sys/arm/at91/ohci_atmelarm.c#2 integrate
.. //depot/projects/iwarp/sys/arm/include/cpuconf.h#3 integrate
.. //depot/projects/iwarp/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/iwarp/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/iwarp/sys/boot/common/loader.8#2 integrate
.. //depot/projects/iwarp/sys/boot/i386/libi386/biosmem.c#2 integrate
.. //depot/projects/iwarp/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/iwarp/sys/bsm/audit.h#2 integrate
.. //depot/projects/iwarp/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/iwarp/sys/compat/linux/linux_ioctl.h#2 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/iwarp/sys/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/iwarp/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/iwarp/sys/compat/svr4/imgact_svr4.c#2 integrate
.. //depot/projects/iwarp/sys/conf/NOTES#2 integrate
.. //depot/projects/iwarp/sys/conf/files#4 integrate
.. //depot/projects/iwarp/sys/conf/files.amd64#3 integrate
.. //depot/projects/iwarp/sys/conf/files.i386#3 integrate
.. //depot/projects/iwarp/sys/conf/options.arm#3 integrate
.. //depot/projects/iwarp/sys/contrib/dev/wpi/LICENSE#1 branch
.. //depot/projects/iwarp/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/fil.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/iwarp/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete
.. //depot/projects/iwarp/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/iwarp/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/iwarp/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/iwarp/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/iwarp/sys/dev/acpica/acpi_ec.c#3 integrate
.. //depot/projects/iwarp/sys/dev/asmc/asmc.c#1 branch
.. //depot/projects/iwarp/sys/dev/asmc/asmcvar.h#1 branch
.. //depot/projects/iwarp/sys/dev/ciss/ciss.c#3 integrate
.. //depot/projects/iwarp/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/iwarp/sys/dev/md/md.c#3 integrate
.. //depot/projects/iwarp/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/iwarp/sys/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/iwarp/sys/dev/mii/gentbi.c#2 integrate
.. //depot/projects/iwarp/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/iwarp/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/iwarp/sys/dev/mii/rgephyreg.h#2 integrate
.. //depot/projects/iwarp/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/if_nxge.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/if_nxge.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/build-version.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/version.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xge-debug.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xge-defs.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xge-list.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xge-os-pal.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xge-os-template.h#2 delete
.. //depot/projects/iwarp/sys/dev/nxge/include/xge-queue.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-channel.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-config.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-device.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-driver.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-event.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-fifo.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-mm.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-regs.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-ring.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-stats.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal-types.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/include/xgehal.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xge-osdep.h#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xge-queue.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate
.. //depot/projects/iwarp/sys/dev/nxge/xgell-version.h#2 integrate
.. //depot/projects/iwarp/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/iwarp/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/iwarp/sys/dev/safe/safe.c#2 integrate
.. //depot/projects/iwarp/sys/dev/sound/pci/atiixp.c#2 integrate
.. //depot/projects/iwarp/sys/dev/sound/pci/atiixp.h#2 integrate
.. //depot/projects/iwarp/sys/dev/sound/pci/t4dwave.c#2 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_axe.c#2 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_axereg.h#2 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_rum.c#2 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_zydfw.h#2 integrate
.. //depot/projects/iwarp/sys/dev/usb/if_zydreg.h#3 integrate
.. //depot/projects/iwarp/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/iwarp/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/iwarp/sys/dev/wpi/if_wpi.c#1 branch
.. //depot/projects/iwarp/sys/dev/wpi/if_wpireg.h#1 branch
.. //depot/projects/iwarp/sys/dev/wpi/if_wpivar.h#1 branch
.. //depot/projects/iwarp/sys/i386/conf/DEFAULTS#3 integrate
.. //depot/projects/iwarp/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/iwarp/sys/i386/conf/PAE#3 integrate
.. //depot/projects/iwarp/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/iwarp/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/iwarp/sys/i386/ibcs2/imgact_coff.c#2 integrate
.. //depot/projects/iwarp/sys/i386/include/pc/bios.h#2 integrate
.. //depot/projects/iwarp/sys/i386/linux/imgact_linux.c#2 integrate
.. //depot/projects/iwarp/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/iwarp/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/iwarp/sys/kern/imgact_aout.c#2 integrate
.. //depot/projects/iwarp/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/iwarp/sys/kern/imgact_gzip.c#2 integrate
.. //depot/projects/iwarp/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/iwarp/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/iwarp/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/iwarp/sys/kern/kern_rmlock.c#1 branch
.. //depot/projects/iwarp/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/iwarp/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/iwarp/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/iwarp/sys/kern/sched_4bsd.c#3 integrate
.. //depot/projects/iwarp/sys/kern/subr_lock.c#2 integrate
.. //depot/projects/iwarp/sys/kern/subr_pcpu.c#2 integrate
.. //depot/projects/iwarp/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/iwarp/sys/kern/sys_process.c#2 integrate
.. //depot/projects/iwarp/sys/kern/tty_pty.c#2 integrate
.. //depot/projects/iwarp/sys/modules/Makefile#3 integrate
.. //depot/projects/iwarp/sys/modules/asmc/Makefile#1 branch
.. //depot/projects/iwarp/sys/modules/nxge/Makefile#2 integrate
.. //depot/projects/iwarp/sys/modules/wpi/Makefile#1 branch
.. //depot/projects/iwarp/sys/modules/wpifw/Makefile#1 branch
.. //depot/projects/iwarp/sys/net/if_bridge.c#3 integrate
.. //depot/projects/iwarp/sys/net/if_bridgevar.h#2 integrate
.. //depot/projects/iwarp/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_freebsd.h#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_ht.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_ioctl.h#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_scan_ap.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/iwarp/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/iwarp/sys/netatalk/aarp.c#3 integrate
.. //depot/projects/iwarp/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate
.. //depot/projects/iwarp/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate
.. //depot/projects/iwarp/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/iwarp/sys/netinet/igmp.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/iwarp/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/iwarp/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/iwarp/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/iwarp/sys/netinet/sctp_constants.h#3 integrate
.. //depot/projects/iwarp/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/iwarp/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/iwarp/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/iwarp/sys/netinet/tcp_output.c#2 integrate
.. //depot/projects/iwarp/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/iwarp/sys/nfsserver/nfs.h#2 integrate
.. //depot/projects/iwarp/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/iwarp/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_ali.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_amd.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_amd64.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_ati.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_intel.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_nvidia.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_sis.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agp_via.c#2 integrate
.. //depot/projects/iwarp/sys/pci/agppriv.h#2 integrate
.. //depot/projects/iwarp/sys/pci/nfsmb.c#2 integrate
.. //depot/projects/iwarp/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/iwarp/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate
.. //depot/projects/iwarp/sys/security/audit/audit.c#3 integrate
.. //depot/projects/iwarp/sys/security/audit/audit_bsm_klib.c#2 integrate
.. //depot/projects/iwarp/sys/security/mac/mac_atalk.c#1 branch
.. //depot/projects/iwarp/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/iwarp/sys/security/mac/mac_inet.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac/mac_inet6.c#1 branch
.. //depot/projects/iwarp/sys/security/mac/mac_internal.h#3 integrate
.. //depot/projects/iwarp/sys/security/mac/mac_net.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac/mac_policy.h#3 integrate
.. //depot/projects/iwarp/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac_ifoff/mac_ifoff.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac_partition/mac_partition.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/iwarp/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/iwarp/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/iwarp/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/iwarp/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/iwarp/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/iwarp/sys/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/iwarp/sys/sys/_rmlock.h#1 branch
.. //depot/projects/iwarp/sys/sys/linux_compat.h#6 integrate
.. //depot/projects/iwarp/sys/sys/lock.h#2 integrate
.. //depot/projects/iwarp/sys/sys/malloc.h#2 integrate
.. //depot/projects/iwarp/sys/sys/pcpu.h#2 integrate
.. //depot/projects/iwarp/sys/sys/proc.h#3 integrate
.. //depot/projects/iwarp/sys/sys/rmlock.h#1 branch
.. //depot/projects/iwarp/sys/sys/signalvar.h#2 integrate
.. //depot/projects/iwarp/sys/sys/smp.h#2 integrate
.. //depot/projects/iwarp/sys/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/iwarp/sys/ufs/ffs/ffs_balloc.c#2 integrate
.. //depot/projects/iwarp/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/iwarp/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/iwarp/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/iwarp/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/iwarp/sys/ufs/ufs/ufs_bmap.c#2 integrate
.. //depot/projects/iwarp/sys/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/iwarp/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/iwarp/sys/vm/phys_pager.c#2 integrate
.. //depot/projects/iwarp/sys/vm/pmap.h#2 integrate
.. //depot/projects/iwarp/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/iwarp/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_map.c#3 integrate
.. //depot/projects/iwarp/sys/vm/vm_map.h#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_page.c#3 integrate
.. //depot/projects/iwarp/tools/build/options/makeman#2 integrate
.. //depot/projects/iwarp/tools/tools/net80211/wlanstats/main.c#2 integrate
.. //depot/projects/iwarp/tools/tools/net80211/wlanstats/statfoo.c#2 integrate
.. //depot/projects/iwarp/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate
.. //depot/projects/iwarp/tools/tools/nxge/Makefile#2 integrate
.. //depot/projects/iwarp/tools/tools/nxge/xge_cmn.h#2 integrate
.. //depot/projects/iwarp/tools/tools/nxge/xge_info.c#2 integrate
.. //depot/projects/iwarp/tools/tools/nxge/xge_info.h#2 integrate
.. //depot/projects/iwarp/tools/tools/nxge/xge_log.c#2 integrate
.. //depot/projects/iwarp/tools/tools/nxge/xge_log.h#2 integrate
.. //depot/projects/iwarp/usr.bin/calendar/calendars/calendar.freebsd#3 integrate
.. //depot/projects/iwarp/usr.bin/calendar/io.c#2 integrate
.. //depot/projects/iwarp/usr.bin/du/du.c#2 integrate
.. //depot/projects/iwarp/usr.bin/file2c/file2c.1#2 integrate
.. //depot/projects/iwarp/usr.bin/file2c/file2c.c#2 integrate
.. //depot/projects/iwarp/usr.bin/fstat/Makefile#2 integrate
.. //depot/projects/iwarp/usr.bin/fstat/fstat.c#2 integrate
.. //depot/projects/iwarp/usr.bin/fstat/fstat.h#2 integrate
.. //depot/projects/iwarp/usr.bin/fstat/zfs/Makefile#1 branch
.. //depot/projects/iwarp/usr.bin/fstat/zfs/zfs.c#1 branch
.. //depot/projects/iwarp/usr.bin/killall/killall.1#2 integrate
.. //depot/projects/iwarp/usr.bin/killall/killall.c#2 integrate
.. //depot/projects/iwarp/usr.bin/lockf/lockf.1#2 integrate
.. //depot/projects/iwarp/usr.bin/mail/aux.c#2 integrate
.. //depot/projects/iwarp/usr.bin/mail/cmd1.c#2 integrate
.. //depot/projects/iwarp/usr.bin/mail/lex.c#2 integrate
.. //depot/projects/iwarp/usr.bin/mail/list.c#2 integrate
.. //depot/projects/iwarp/usr.bin/mail/main.c#2 integrate
.. //depot/projects/iwarp/usr.bin/make/make.1#2 integrate
.. //depot/projects/iwarp/usr.bin/mklocale/ldef.h#2 integrate
.. //depot/projects/iwarp/usr.bin/msgs/msgs.c#2 integrate
.. //depot/projects/iwarp/usr.bin/passwd/passwd.1#2 integrate
.. //depot/projects/iwarp/usr.bin/sed/main.c#2 integrate
.. //depot/projects/iwarp/usr.bin/tail/read.c#3 integrate
.. //depot/projects/iwarp/usr.bin/tail/reverse.c#2 integrate
.. //depot/projects/iwarp/usr.bin/tail/tail.c#2 integrate
.. //depot/projects/iwarp/usr.bin/tftp/tftp.1#2 integrate
.. //depot/projects/iwarp/usr.bin/xstr/xstr.1#2 integrate
.. //depot/projects/iwarp/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/bootparamd/bootparamd/bootparamd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/bootparamd/bootparamd/main.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/bootparamd/callbootd/callbootd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/cron/cron/cron.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/cron/cron/cron.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/cron/cron/database.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/cron/cron/do_command.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/cron/cron/externs.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/cron/crontab/crontab.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/cron/lib/entry.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/crunch/crunchide/crunchide.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/faithd/faithd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/faithd/faithd.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/faithd/ftp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/faithd/prefix.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/faithd/prefix.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/faithd/tcp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate
.. //depot/projects/iwarp/usr.sbin/fwcontrol/fwcontrol.8#2 integrate
.. //depot/projects/iwarp/usr.sbin/ifmcstat/ifmcstat.8#2 integrate
.. //depot/projects/iwarp/usr.sbin/ip6addrctl/ip6addrctl.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/keyserv/keyserv.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/keyserv/keyserv.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/keyserv/setkey.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/lpr/lpd/lpd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/mtree/mtree.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/ndp/ndp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pccard/pccardc/enabler.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pciconf/cap.c#3 integrate
.. //depot/projects/iwarp/usr.sbin/pciconf/pciconf.8#2 integrate
.. //depot/projects/iwarp/usr.sbin/pciconf/pciconf.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/Makefile#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/add/add.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/add/main.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/add/perform.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/add/pkg_add.1#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/create/main.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/delete/main.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/delete/perform.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/info/main.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/lib/lib.h#3 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/lib/match.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/sign/extern.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/sign/gzip.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/sign/pgp.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/sign/stand.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/updating/Makefile#1 branch
.. //depot/projects/iwarp/usr.sbin/pkg_install/updating/main.c#1 branch
.. //depot/projects/iwarp/usr.sbin/pkg_install/updating/pathnames.h#1 branch
.. //depot/projects/iwarp/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch
.. //depot/projects/iwarp/usr.sbin/pkg_install/version/main.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pkg_install/version/version.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/auth.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/cbcp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/ccp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/chap.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/chap.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/chap_ms.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/chap_ms.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/demand.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/eui64.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/fsm.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/fsm.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/ipcp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/ipcp.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/ipv6cp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/ipv6cp.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/ipxcp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/lcp.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/lcp.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/magic.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/magic.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/main.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/options.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/pppd.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/sys-bsd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/upap.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppd/upap.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/pppstats/pppstats.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rip6query/rip6query.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/route6d/route6d.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpc.lockd/rpc.lockd.8#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpc.statd/rpc.statd.8#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpc.statd/statd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/check_bound.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/pmap_svc.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/rpcb_svc.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/rpcbind.c#3 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/rpcbind.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/util.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rpcbind/warmstart.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rrenumd/lexer.l#2 integrate
.. //depot/projects/iwarp/usr.sbin/rrenumd/parser.y#2 integrate
.. //depot/projects/iwarp/usr.sbin/rrenumd/rrenumd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/advcap.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/advcap.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/config.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/config.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/dump.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/dump.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/if.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/if.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/rrenum.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/rtadvd.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/rtadvd.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/timer.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtadvd/timer.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtsold/dump.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtsold/if.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtsold/probe.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtsold/rtsock.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtsold/rtsol.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtsold/rtsold.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/rtsold/rtsold.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/sysinstall/config.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/sysinstall/dist.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/sysinstall/dist.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/sysinstall/dmenu.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/sysinstall/menus.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/tcpdrop/tcpdrop.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/timed/timed/correct.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/timed/timed/extern.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/timed/timed/master.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/timed/timed/networkdelta.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/timed/timed/slave.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/timed/timedc/extern.h#2 integrate
.. //depot/projects/iwarp/usr.sbin/timed/timedc/timedc.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/traceroute6/traceroute6.c#3 integrate
.. //depot/projects/iwarp/usr.sbin/wpa/hostapd/Makefile#2 integrate
.. //depot/projects/iwarp/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/iwarp/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate
Differences ...
==== //depot/projects/iwarp/Makefile.inc1#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -159,7 +159,14 @@
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
+#
+# Avoid running mktemp(1) unless actually needed.
+# It may not be functional, e.g., due to new ABI
+# when in the middle of installing over this system.
+#
+.if make(distributeworld) || make(installworld)
INSTALLTMP!= /usr/bin/mktemp -d -u -t install
+.endif
#
# Building a world goes through the following stages
@@ -265,14 +272,16 @@
.endif
# install stage
+IMAKEENV= ${CROSSENV}
+IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
.if empty(.MAKEFLAGS:M-n)
-IMAKEENV= ${CROSSENV} \
- PATH=${STRICTTMPPATH}:${INSTALLTMP}
+IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \
+ LD_LIBRARY_PATH=${INSTALLTMP} \
+ PATH_LOCALE=${INSTALLTMP}/locale
+IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh
.else
-IMAKEENV= ${CROSSENV} \
- PATH=${TMPPATH}:${INSTALLTMP}
+IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP}
.endif
-IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
# kernel stage
KMAKEENV= ${WMAKEENV}
@@ -564,6 +573,14 @@
.endfor
#
+# Required install tools to be saved in a scratch dir for safety.
+#
+ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
+ date echo egrep find grep install-info \
+ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
+ test true uname wc zic
+
+#
# distributeworld
#
# Distributes everything compiled by a `buildworld'.
@@ -574,19 +591,20 @@
#
distributeworld installworld: installcheck
mkdir -p ${INSTALLTMP}
- for prog in [ awk cap_mkdb cat chflags chmod chown \
- date echo egrep find grep install-info \
- ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
- test true uname wc zic; do \
+ for prog in ${ITOOLS}; do \
if progpath=`which $$prog`; then \
- cp $$progpath ${INSTALLTMP}; \
+ progs="$$progs $$progpath"; \
else \
- echo "Required install tool $$prog not found" >&2; \
+ echo "Required tool $$prog not found in PATH." >&2; \
exit 1; \
fi; \
- done
- ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
- rm -rf ${INSTALLTMP}
+ done; \
+ cp $$progs ${INSTALLTMP}; \
+ cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
+ sort -u` ${INSTALLTMP}
+ cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
+ ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
+ ${IMAKEENV} rm -rf ${INSTALLTMP}
#
# reinstall
==== //depot/projects/iwarp/ObsoleteFiles.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,9 +14,12 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20071108: Removed very crunch OLDCARD support file
+OLD_FILES+=etc/defaults/pccard.conf
# 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
+OLD_FILES+=etc/cached.conf
OLD_FILES+=etc/rc.d/cached
OLD_FILES+=usr/sbin/cached
OLD_FILES+=usr/share/man/man5/cached.conf.5.gz
==== //depot/projects/iwarp/bin/mv/mv.1#2 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mv.1 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $
.\"
-.Dd July 9, 2002
+.Dd May 12, 2007
.Dt MV 1
.Os
.Sh NAME
==== //depot/projects/iwarp/bin/ps/keyword.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -186,9 +186,8 @@
{"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid),
UINT, UIDFMT, 0},
{"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0},
+ {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0},
{"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0},
- {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR,
- NULL, 0},
{"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT,
PIDFMT, 0},
{"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT,
==== //depot/projects/iwarp/bin/ps/ps.c#3 (text+ko) ====
@@ -47,7 +47,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -74,6 +74,8 @@
#include "ps.h"
+#define _PATH_PTS "/dev/pts/"
+
#define W_SEP " \t" /* "Whitespace" list separators */
#define T_SEP "," /* "Terminate-element" list separators */
@@ -706,9 +708,9 @@
/*-
* The user can specify a device via one of three formats:
- * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console
- * 2) missing "/dev", e.g.: ttyp0 console
- * 3) two-letters, e.g.: p0 co
+ * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0
+ * 2) missing "/dev", e.g.: ttyp0 console pts/0
+ * 3) two-letters, e.g.: p0 co 0
* (matching letters that would be seen in the "TT" column)
*/
static int
@@ -716,10 +718,11 @@
{
const char *ttypath;
struct stat sb;
- char pathbuf[PATH_MAX], pathbuf2[PATH_MAX];
+ char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX];
ttypath = NULL;
pathbuf2[0] = '\0';
+ pathbuf3[0] = '\0';
switch (*elem) {
case '/':
ttypath = elem;
@@ -736,6 +739,8 @@
ttypath = pathbuf;
if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0)
break;
+ if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0)
+ break;
if (strcmp(pathbuf, _PATH_CONSOLE) == 0)
break;
/* Check to see if /dev/tty${elem} exists */
@@ -746,21 +751,30 @@
ttypath = NULL;
break;
}
+ /* Check to see if /dev/pts/${elem} exists */
+ strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3));
+ strlcat(pathbuf3, elem, sizeof(pathbuf3));
+ if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) {
+ /* No need to repeat stat() && S_ISCHR() checks */
+ ttypath = NULL;
+ break;
+ }
break;
}
if (ttypath) {
if (stat(ttypath, &sb) == -1) {
- if (pathbuf2[0] != '\0')
- warn("%s and %s", pathbuf2, ttypath);
+ if (pathbuf3[0] != '\0')
+ warn("%s, %s, and %s", pathbuf3, pathbuf2,
+ ttypath);
else
warn("%s", ttypath);
optfatal = 1;
return (0);
}
if (!S_ISCHR(sb.st_mode)) {
- if (pathbuf2[0] != '\0')
- warnx("%s and %s: Not a terminal", pathbuf2,
- ttypath);
+ if (pathbuf3[0] != '\0')
+ warnx("%s, %s, and %s: Not a terminal",
+ pathbuf3, pathbuf2, ttypath);
else
warnx("%s: Not a terminal", ttypath);
optfatal = 1;
==== //depot/projects/iwarp/contrib/libreadline/FREEBSD-upgrade#2 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $
+# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $
#
# Official patch 001 imported as v5_2_p1
# Official patch 002 imported as v5_2_p2
+# Official patches 003-007 imported as v5_2_p3_p7
#
rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf
==== //depot/projects/iwarp/contrib/libreadline/complete.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */
+/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */
/* complete.c -- filename completion for readline. */
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
@@ -429,7 +429,7 @@
return (1);
if (c == 'n' || c == 'N' || c == RUBOUT)
return (0);
- if (c == ABORT_CHAR)
+ if (c == ABORT_CHAR || c < 0)
_rl_abort_internal ();
if (for_pager && (c == NEWLINE || c == RETURN))
return (2);
==== //depot/projects/iwarp/contrib/libreadline/display.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */
+/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */
/* display.c -- readline redisplay facility. */
/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
@@ -1519,11 +1519,31 @@
{
/* Non-zero if we're increasing the number of lines. */
int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
+ /* If col_lendiff is > 0, implying that the new string takes up more
+ screen real estate than the old, but lendiff is < 0, meaning that it
+ takes fewer bytes, we need to just output the characters starting
+ from the first difference. These will overwrite what is on the
+ display, so there's no reason to do a smart update. This can really
+ only happen in a multibyte environment. */
+ if (lendiff < 0)
+ {
+ _rl_output_some_chars (nfd, temp);
+ _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+ /* If nfd begins before any invisible characters in the prompt,
+ adjust _rl_last_c_pos to account for wrap_offset and set
+ cpos_adjusted to let the caller know. */
+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ {
+ _rl_last_c_pos -= wrap_offset;
+ cpos_adjusted = 1;
+ }
+ return;
+ }
/* Sometimes it is cheaper to print the characters rather than
use the terminal's capabilities. If we're growing the number
of lines, make sure we actually cause the new line to wrap
around on auto-wrapping terminals. */
- if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
+ else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
{
/* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
_rl_horizontal_scroll_mode == 1, inserting the characters with
@@ -1599,8 +1619,22 @@
temp = nls - nfd;
if (temp > 0)
{
+ /* If nfd begins at the prompt, or before the invisible
+ characters in the prompt, we need to adjust _rl_last_c_pos
+ in a multibyte locale to account for the wrap offset and
+ set cpos_adjusted accordingly. */
_rl_output_some_chars (nfd, temp);
- _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ {
+ _rl_last_c_pos -= wrap_offset;
+ cpos_adjusted = 1;
+ }
+ }
+ else
+ _rl_last_c_pos += temp;
}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list