PERFORCE change 171294 for review
Josh Carter
josh at FreeBSD.org
Wed Dec 2 19:44:45 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=171294
Change 171294 by josh at josh-freebsd on 2009/12/02 19:44:34
Integration from vendor/freebsd p4 revision 171288, svn revision 200042.
Affected files ...
.. //depot/projects/zfs/ObsoleteFiles.inc#2 integrate
.. //depot/projects/zfs/UPDATING#2 integrate
.. //depot/projects/zfs/bin/Makefile#2 integrate
.. //depot/projects/zfs/bin/ps/keyword.c#2 integrate
.. //depot/projects/zfs/bin/pwait/Makefile#1 branch
.. //depot/projects/zfs/bin/pwait/pwait.1#1 branch
.. //depot/projects/zfs/bin/pwait/pwait.c#1 branch
.. //depot/projects/zfs/bin/sh/cd.c#2 integrate
.. //depot/projects/zfs/bin/sh/error.c#2 integrate
.. //depot/projects/zfs/bin/sh/error.h#2 integrate
.. //depot/projects/zfs/bin/sh/eval.c#2 integrate
.. //depot/projects/zfs/bin/sh/histedit.c#2 integrate
.. //depot/projects/zfs/bin/sh/input.c#2 integrate
.. //depot/projects/zfs/bin/sh/input.h#2 integrate
.. //depot/projects/zfs/bin/sh/jobs.c#2 integrate
.. //depot/projects/zfs/bin/sh/main.c#2 integrate
.. //depot/projects/zfs/bin/sh/output.c#2 integrate
.. //depot/projects/zfs/bin/sh/output.h#2 integrate
.. //depot/projects/zfs/bin/sh/parser.c#2 integrate
.. //depot/projects/zfs/bin/sh/redir.c#2 integrate
.. //depot/projects/zfs/bin/sh/trap.c#2 integrate
.. //depot/projects/zfs/bin/sh/var.c#2 integrate
.. //depot/projects/zfs/cddl/usr.bin/ztest/Makefile#2 edit
.. //depot/projects/zfs/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/query.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/api#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/types.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/masterdump.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/rbtdb.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/resolver.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/validator.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/version#2 integrate
.. //depot/projects/zfs/contrib/file/magic2mime#1 branch
.. //depot/projects/zfs/contrib/gcc/config/freebsd-spec.h#2 integrate
.. //depot/projects/zfs/contrib/ipfilter/man/ipf.8#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntp_io.c#2 integrate
.. //depot/projects/zfs/contrib/telnet/telnet/externs.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/sshd.c#2 integrate
.. //depot/projects/zfs/etc/Makefile#2 integrate
.. //depot/projects/zfs/etc/defaults/rc.conf#2 integrate
.. //depot/projects/zfs/etc/rc.d/Makefile#2 integrate
.. //depot/projects/zfs/etc/rc.d/ip6fw#2 delete
.. //depot/projects/zfs/etc/rc.d/ipfw#2 integrate
.. //depot/projects/zfs/etc/rc.firewall#2 integrate
.. //depot/projects/zfs/etc/rc.firewall6#2 delete
.. //depot/projects/zfs/games/factor/factor.c#2 integrate
.. //depot/projects/zfs/include/Makefile#2 integrate
.. //depot/projects/zfs/include/signal.h#2 integrate
.. //depot/projects/zfs/include/termios.h#1 branch
.. //depot/projects/zfs/lib/bind/config.h#2 integrate
.. //depot/projects/zfs/lib/csu/amd64/Makefile#2 integrate
.. //depot/projects/zfs/lib/csu/arm/Makefile#2 integrate
.. //depot/projects/zfs/lib/csu/i386-elf/Makefile#2 integrate
.. //depot/projects/zfs/lib/csu/i386-elf/crt1.c#2 delete
.. //depot/projects/zfs/lib/csu/i386-elf/crt1_c.c#1 branch
.. //depot/projects/zfs/lib/csu/i386-elf/crt1_s.S#1 branch
.. //depot/projects/zfs/lib/csu/ia64/Makefile#2 integrate
.. //depot/projects/zfs/lib/csu/mips/Makefile#2 integrate
.. //depot/projects/zfs/lib/csu/powerpc/Makefile#2 integrate
.. //depot/projects/zfs/lib/csu/sparc64/Makefile#2 integrate
.. //depot/projects/zfs/lib/libc/compat-43/Makefile.inc#2 integrate
.. //depot/projects/zfs/lib/libc/compat-43/Symbol.map#2 integrate
.. //depot/projects/zfs/lib/libc/compat-43/sigcompat.c#2 integrate
.. //depot/projects/zfs/lib/libc/compat-43/sigpause.2#2 integrate
.. //depot/projects/zfs/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/zfs/lib/libc/gen/_once_stub.c#1 branch
.. //depot/projects/zfs/lib/libc/gen/_pthread_stubs.c#2 integrate
.. //depot/projects/zfs/lib/libc/gen/exec.c#2 integrate
.. //depot/projects/zfs/lib/libc/gen/fts.3#2 integrate
.. //depot/projects/zfs/lib/libc/gen/fts.c#2 integrate
.. //depot/projects/zfs/lib/libc/gen/getcap.c#2 integrate
.. //depot/projects/zfs/lib/libc/gen/getusershell.c#2 integrate
.. //depot/projects/zfs/lib/libc/gen/tzset.3#2 integrate
.. //depot/projects/zfs/lib/libc/gen/wordexp.c#2 integrate
.. //depot/projects/zfs/lib/libc/include/libc_private.h#2 integrate
.. //depot/projects/zfs/lib/libc/net/sctp_send.3#2 integrate
.. //depot/projects/zfs/lib/libc/net/sctp_sendmsg.3#2 integrate
.. //depot/projects/zfs/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate
.. //depot/projects/zfs/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate
.. //depot/projects/zfs/lib/libc/nls/ko_KR.eucKR.msg#2 integrate
.. //depot/projects/zfs/lib/libc/rpc/clnt_raw.c#2 integrate
.. //depot/projects/zfs/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/zfs/lib/libc/rpc/getrpcent.c#2 integrate
.. //depot/projects/zfs/lib/libc/rpc/key_call.c#2 integrate
.. //depot/projects/zfs/lib/libc/rpc/svc_raw.c#2 integrate
.. //depot/projects/zfs/lib/libc/stdio/fgetws.c#2 integrate
.. //depot/projects/zfs/lib/libc/stdio/fvwrite.c#2 integrate
.. //depot/projects/zfs/lib/libc/stdio/printf.3#2 integrate
.. //depot/projects/zfs/lib/libc/stdio/vfwprintf.c#2 integrate
.. //depot/projects/zfs/lib/libc/stdio/xprintf_time.c#2 integrate
.. //depot/projects/zfs/lib/libc/stdlib/getenv.c#2 integrate
.. //depot/projects/zfs/lib/libc/stdtime/localtime.c#2 integrate
.. //depot/projects/zfs/lib/libc/string/strcat.3#2 integrate
.. //depot/projects/zfs/lib/libc/sys/setpgid.2#2 integrate
.. //depot/projects/zfs/lib/libc/yp/yplib.c#2 integrate
.. //depot/projects/zfs/lib/libfetch/ftp.c#2 integrate
.. //depot/projects/zfs/lib/librt/Makefile#2 integrate
.. //depot/projects/zfs/lib/librt/mq.c#2 integrate
.. //depot/projects/zfs/lib/librt/sigev_thread.c#2 integrate
.. //depot/projects/zfs/lib/libtacplus/taclib.c#2 integrate
.. //depot/projects/zfs/lib/libthr/Makefile#2 integrate
.. //depot/projects/zfs/lib/libusb/libusb10.c#2 integrate
.. //depot/projects/zfs/lib/libusb/libusb10.h#2 integrate
.. //depot/projects/zfs/lib/libusb/libusb20.3#2 integrate
.. //depot/projects/zfs/lib/libusb/libusb20.c#2 integrate
.. //depot/projects/zfs/lib/libusb/libusb20.h#2 integrate
.. //depot/projects/zfs/lib/libutil/libutil.h#2 integrate
.. //depot/projects/zfs/lib/libutil/pw_util.c#2 integrate
.. //depot/projects/zfs/libexec/rtld-elf/rtld.c#2 integrate
.. //depot/projects/zfs/libexec/rtld-elf/rtld.h#2 integrate
.. //depot/projects/zfs/sbin/atacontrol/atacontrol.c#2 integrate
.. //depot/projects/zfs/sbin/camcontrol/camcontrol.8#2 integrate
.. //depot/projects/zfs/sbin/camcontrol/camcontrol.c#2 integrate
.. //depot/projects/zfs/sbin/fsck/fsck.c#2 integrate
.. //depot/projects/zfs/sbin/ifconfig/ifconfig.c#2 integrate
.. //depot/projects/zfs/sbin/ipfw/dummynet.c#2 integrate
.. //depot/projects/zfs/sbin/mount_cd9660/mount_cd9660.c#2 integrate
.. //depot/projects/zfs/share/man/man3/queue.3#2 integrate
.. //depot/projects/zfs/share/man/man4/Makefile#2 integrate
.. //depot/projects/zfs/share/man/man4/ada.4#1 branch
.. //depot/projects/zfs/share/man/man4/amdsbwd.4#1 branch
.. //depot/projects/zfs/share/man/man4/ata.4#2 integrate
.. //depot/projects/zfs/share/man/man4/ipsec.4#2 integrate
.. //depot/projects/zfs/share/man/man4/mfi.4#2 integrate
.. //depot/projects/zfs/share/man/man4/sctp.4#2 integrate
.. //depot/projects/zfs/share/man/man4/wi.4#2 integrate
.. //depot/projects/zfs/share/man/man8/Makefile#2 integrate
.. //depot/projects/zfs/share/man/man8/rc.8#2 integrate
.. //depot/projects/zfs/share/man/man9/VOP_OPENCLOSE.9#2 integrate
.. //depot/projects/zfs/share/man/man9/ifnet.9#2 integrate
.. //depot/projects/zfs/share/misc/bsd-family-tree#2 integrate
.. //depot/projects/zfs/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/zfs/share/zoneinfo/antarctica#2 integrate
.. //depot/projects/zfs/share/zoneinfo/australasia#2 integrate
.. //depot/projects/zfs/share/zoneinfo/etcetera#2 integrate
.. //depot/projects/zfs/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate
.. //depot/projects/zfs/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate
.. //depot/projects/zfs/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/zfs/sys/amd64/amd64/mca.c#2 integrate
.. //depot/projects/zfs/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/zfs/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/zfs/sys/amd64/include/mca.h#2 integrate
.. //depot/projects/zfs/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/zfs/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/zfs/sys/arm/at91/if_ate.c#2 integrate
.. //depot/projects/zfs/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/zfs/sys/arm/conf/CAMBRIA#2 integrate
.. //depot/projects/zfs/sys/boot/Makefile#2 integrate
.. //depot/projects/zfs/sys/boot/forth/loader.conf.5#2 integrate
.. //depot/projects/zfs/sys/boot/i386/Makefile#2 integrate
.. //depot/projects/zfs/sys/boot/i386/libi386/Makefile#2 integrate
.. //depot/projects/zfs/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate
.. //depot/projects/zfs/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate
.. //depot/projects/zfs/sys/boot/i386/libi386/spinconsole.c#1 branch
.. //depot/projects/zfs/sys/boot/i386/libi386/vidconsole.c#2 integrate
.. //depot/projects/zfs/sys/boot/i386/loader/Makefile#2 integrate
.. //depot/projects/zfs/sys/boot/i386/loader/conf.c#2 integrate
.. //depot/projects/zfs/sys/boot/i386/zfsboot/zfsboot.c#2 integrate
.. //depot/projects/zfs/sys/boot/i386/zfsboot/zfsldr.S#2 integrate
.. //depot/projects/zfs/sys/boot/i386/zfsloader/Makefile#1 branch
.. //depot/projects/zfs/sys/boot/pc98/loader/conf.c#2 integrate
.. //depot/projects/zfs/sys/boot/uboot/common/metadata.c#2 integrate
.. //depot/projects/zfs/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/zfs/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/zfs/sys/cam/ata/ata_pmp.c#2 integrate
.. //depot/projects/zfs/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/zfs/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/zfs/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/zfs/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/zfs/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch
.. //depot/projects/zfs/sys/compat/svr4/svr4_termios.c#2 integrate
.. //depot/projects/zfs/sys/conf/files#2 integrate
.. //depot/projects/zfs/sys/conf/files.amd64#2 integrate
.. //depot/projects/zfs/sys/conf/files.i386#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/events/evregion.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exfield.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exregion.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/include/acmacros.h#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/parser/psloop.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/parser/psparse.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/parser/psxface.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/zfs/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate
.. //depot/projects/zfs/sys/ddb/db_command.c#2 integrate
.. //depot/projects/zfs/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/zfs/sys/dev/acpica/acpi_dock.c#2 integrate
.. //depot/projects/zfs/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/zfs/sys/dev/acpica/acpi_video.c#2 integrate
.. //depot/projects/zfs/sys/dev/adb/adb.h#2 integrate
.. //depot/projects/zfs/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/zfs/sys/dev/adb/adb_mouse.c#2 integrate
.. //depot/projects/zfs/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/zfs/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/zfs/sys/dev/amdsbwd/amdsbwd.c#1 branch
.. //depot/projects/zfs/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/zfs/sys/dev/an/if_an_isa.c#2 integrate
.. //depot/projects/zfs/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/zfs/sys/dev/an/if_an_pci.c#2 integrate
.. //depot/projects/zfs/sys/dev/an/if_anreg.h#2 integrate
.. //depot/projects/zfs/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/zfs/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/zfs/sys/dev/ata/ata-usb.c#2 delete
.. //depot/projects/zfs/sys/dev/ata/chipsets/ata-intel.c#2 integrate
.. //depot/projects/zfs/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate
.. //depot/projects/zfs/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/zfs/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/zfs/sys/dev/ce/if_ce.c#2 integrate
.. //depot/projects/zfs/sys/dev/cm/smc90cx6.c#2 integrate
.. //depot/projects/zfs/sys/dev/cm/smc90cx6var.h#2 integrate
.. //depot/projects/zfs/sys/dev/cp/if_cp.c#2 integrate
.. //depot/projects/zfs/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/zfs/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/zfs/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/zfs/sys/dev/cxgb/cxgb_t3fw.h#2 integrate
.. //depot/projects/zfs/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate
.. //depot/projects/zfs/sys/dev/de/if_de.c#2 integrate
.. //depot/projects/zfs/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/zfs/sys/dev/ed/if_ed.c#2 integrate
.. //depot/projects/zfs/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/zfs/sys/dev/ed/if_edvar.h#2 integrate
.. //depot/projects/zfs/sys/dev/ep/if_ep.c#2 integrate
.. //depot/projects/zfs/sys/dev/ep/if_epvar.h#2 integrate
.. //depot/projects/zfs/sys/dev/et/if_et.c#2 integrate
.. //depot/projects/zfs/sys/dev/et/if_etreg.h#2 integrate
.. //depot/projects/zfs/sys/dev/et/if_etvar.h#2 integrate
.. //depot/projects/zfs/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/zfs/sys/dev/fatm/if_fatmvar.h#2 integrate
.. //depot/projects/zfs/sys/dev/fe/if_fe_pccard.c#2 integrate
.. //depot/projects/zfs/sys/dev/hatm/if_hatm.c#2 integrate
.. //depot/projects/zfs/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/zfs/sys/dev/hwpmc/hwpmc_mod.c#2 integrate
.. //depot/projects/zfs/sys/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/zfs/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/zfs/sys/dev/ixgb/if_ixgb.c#2 integrate
.. //depot/projects/zfs/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/zfs/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/zfs/sys/dev/lge/if_lgereg.h#2 integrate
.. //depot/projects/zfs/sys/dev/lmc/if_lmc.c#2 integrate
.. //depot/projects/zfs/sys/dev/lmc/if_lmc.h#2 integrate
.. //depot/projects/zfs/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/zfs/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/zfs/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/zfs/sys/dev/mwl/if_mwl.c#2 integrate
.. //depot/projects/zfs/sys/dev/mwl/if_mwlvar.h#2 integrate
.. //depot/projects/zfs/sys/dev/my/if_my.c#2 integrate
.. //depot/projects/zfs/sys/dev/my/if_myreg.h#2 integrate
.. //depot/projects/zfs/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/zfs/sys/dev/nve/if_nvereg.h#2 integrate
.. //depot/projects/zfs/sys/dev/nxge/if_nxge.c#2 integrate
.. //depot/projects/zfs/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/zfs/sys/dev/pcn/if_pcn.c#2 integrate
.. //depot/projects/zfs/sys/dev/pcn/if_pcnreg.h#2 integrate
.. //depot/projects/zfs/sys/dev/pdq/if_fea.c#2 integrate
.. //depot/projects/zfs/sys/dev/pdq/if_fpa.c#2 integrate
.. //depot/projects/zfs/sys/dev/pdq/pdq_freebsd.h#2 integrate
.. //depot/projects/zfs/sys/dev/pdq/pdq_ifsubr.c#2 integrate
.. //depot/projects/zfs/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/zfs/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/zfs/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/zfs/sys/dev/sn/if_sn.c#2 integrate
.. //depot/projects/zfs/sys/dev/sn/if_sn_pccard.c#2 integrate
.. //depot/projects/zfs/sys/dev/sn/if_snvar.h#2 integrate
.. //depot/projects/zfs/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/zfs/sys/dev/sound/usb/uaudio.c#2 integrate
.. //depot/projects/zfs/sys/dev/ste/if_ste.c#2 integrate
.. //depot/projects/zfs/sys/dev/ste/if_stereg.h#2 integrate
.. //depot/projects/zfs/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/zfs/sys/dev/syscons/sysmouse.c#2 integrate
.. //depot/projects/zfs/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/zfs/sys/dev/ti/if_tireg.h#2 integrate
.. //depot/projects/zfs/sys/dev/tl/if_tl.c#2 integrate
.. //depot/projects/zfs/sys/dev/tl/if_tlreg.h#2 integrate
.. //depot/projects/zfs/sys/dev/tsec/if_tsec.c#2 integrate
.. //depot/projects/zfs/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/zfs/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/at91dci.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/atmegadci.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/avr32dci.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/ehci.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/musb_otg.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/musb_otg.h#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/ohci.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/uhci.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/uhci_pci.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/uhcireg.h#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/usb_controller.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/controller/uss820dci.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/input/atp.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/input/ukbd.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/net/if_aue.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/net/if_axe.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/net/if_cdce.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/net/if_cue.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/net/if_kue.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/net/if_rue.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/net/if_udav.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/u3g.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/uark.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/ubser.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/ucycom.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/ufoma.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/uftdi.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/ugensa.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/umct.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/umodem.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/uplcom.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/serial/usb_serial.h#2 integrate
.. //depot/projects/zfs/sys/dev/usb/storage/umass.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/template/usb_template.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_busdma.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_core.h#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_debug.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_debug.h#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_dev.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_device.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_generic.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_hid.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_hub.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_hub.h#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_msctest.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_process.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_request.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usb_transfer.c#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usbdi.h#2 integrate
.. //depot/projects/zfs/sys/dev/usb/usbdi_util.h#1 branch
.. //depot/projects/zfs/sys/dev/usb/wlan/if_upgt.c#2 integrate
.. //depot/projects/zfs/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/zfs/sys/dev/vge/if_vgevar.h#2 integrate
.. //depot/projects/zfs/sys/dev/vx/if_vx.c#2 integrate
.. //depot/projects/zfs/sys/dev/vx/if_vxvar.h#2 integrate
.. //depot/projects/zfs/sys/dev/wb/if_wb.c#2 integrate
.. //depot/projects/zfs/sys/dev/wb/if_wbreg.h#2 integrate
.. //depot/projects/zfs/sys/dev/wl/if_wl.c#2 integrate
.. //depot/projects/zfs/sys/dev/xen/blkfront/blkfront.c#2 integrate
.. //depot/projects/zfs/sys/dev/xen/blkfront/block.h#2 integrate
.. //depot/projects/zfs/sys/dev/xen/console/console.c#2 integrate
.. //depot/projects/zfs/sys/dev/xen/netfront/netfront.c#2 integrate
.. //depot/projects/zfs/sys/fs/nfs/nfs_var.h#2 integrate
.. //depot/projects/zfs/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate
.. //depot/projects/zfs/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate
.. //depot/projects/zfs/sys/fs/portalfs/portal_vnops.c#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label.c#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label.h#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label_ext2fs.c#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label_gpt.c#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label_iso9660.c#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label_msdosfs.c#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label_ntfs.c#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label_reiserfs.c#2 integrate
.. //depot/projects/zfs/sys/geom/label/g_label_ufs.c#2 integrate
.. //depot/projects/zfs/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/zfs/sys/i386/i386/bpf_jit_machdep.c#2 integrate
.. //depot/projects/zfs/sys/i386/i386/bpf_jit_machdep.h#2 integrate
.. //depot/projects/zfs/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/zfs/sys/i386/i386/mca.c#2 integrate
.. //depot/projects/zfs/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/zfs/sys/i386/include/mca.h#2 integrate
.. //depot/projects/zfs/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/zfs/sys/i386/xen/exception.s#2 integrate
.. //depot/projects/zfs/sys/i386/xen/pmap.c#2 integrate
.. //depot/projects/zfs/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/zfs/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/zfs/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/zfs/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/zfs/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/zfs/sys/ia64/include/param.h#2 integrate
.. //depot/projects/zfs/sys/ia64/include/pcpu.h#2 integrate
.. //depot/projects/zfs/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/zfs/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/zfs/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/zfs/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/zfs/sys/kern/sys_process.c#2 integrate
.. //depot/projects/zfs/sys/kern/tty.c#2 integrate
.. //depot/projects/zfs/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/zfs/sys/mips/adm5120/if_admsw.c#2 integrate
.. //depot/projects/zfs/sys/mips/adm5120/if_admswvar.h#2 integrate
.. //depot/projects/zfs/sys/mips/mips/trap.c#2 integrate
.. //depot/projects/zfs/sys/modules/Makefile#2 integrate
.. //depot/projects/zfs/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/zfs/sys/modules/amdsbwd/Makefile#1 branch
.. //depot/projects/zfs/sys/modules/ata/atausb/Makefile#2 delete
.. //depot/projects/zfs/sys/net/bpf_jitter.c#2 integrate
.. //depot/projects/zfs/sys/net/bpf_jitter.h#2 integrate
.. //depot/projects/zfs/sys/net/if.c#2 integrate
.. //depot/projects/zfs/sys/net/if_dead.c#2 integrate
.. //depot/projects/zfs/sys/net/if_var.h#2 integrate
.. //depot/projects/zfs/sys/net/route.c#2 integrate
.. //depot/projects/zfs/sys/netinet/in.h#2 integrate
.. //depot/projects/zfs/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/zfs/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/zfs/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/zfs/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/zfs/sys/netinet/ipfw/ip_fw2.c#2 integrate
.. //depot/projects/zfs/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/zfs/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/zfs/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/zfs/sys/netinet6/in6_mcast.c#2 integrate
.. //depot/projects/zfs/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/zfs/sys/netipsec/ipcomp_var.h#2 integrate
.. //depot/projects/zfs/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/zfs/sys/netipsec/key.c#2 integrate
.. //depot/projects/zfs/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/zfs/sys/opencrypto/crypto.c#2 integrate
.. //depot/projects/zfs/sys/opencrypto/cryptosoft.c#2 integrate
.. //depot/projects/zfs/sys/opencrypto/deflate.c#2 integrate
.. //depot/projects/zfs/sys/opencrypto/deflate.h#2 integrate
.. //depot/projects/zfs/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/zfs/sys/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/zfs/sys/powerpc/aim/ofw_machdep.c#2 integrate
.. //depot/projects/zfs/sys/powerpc/aim/trap.c#2 integrate
.. //depot/projects/zfs/sys/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/zfs/sys/powerpc/booke/trap.c#2 integrate
.. //depot/projects/zfs/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/zfs/sys/powerpc/include/cpu.h#2 integrate
.. //depot/projects/zfs/sys/powerpc/include/md_var.h#2 integrate
.. //depot/projects/zfs/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/zfs/sys/powerpc/mpc85xx/pci_ocp.c#2 integrate
.. //depot/projects/zfs/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/zfs/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/zfs/sys/sparc64/sparc64/trap.c#2 integrate
.. //depot/projects/zfs/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/zfs/sys/sys/_termios.h#1 branch
.. //depot/projects/zfs/sys/sys/ata.h#2 integrate
.. //depot/projects/zfs/sys/sys/elf_common.h#2 integrate
.. //depot/projects/zfs/sys/sys/param.h#2 integrate
.. //depot/projects/zfs/sys/sys/sdt.h#2 integrate
.. //depot/projects/zfs/sys/sys/signal.h#2 integrate
.. //depot/projects/zfs/sys/sys/signalvar.h#2 integrate
.. //depot/projects/zfs/sys/sys/termios.h#2 integrate
.. //depot/projects/zfs/sys/sys/tty.h#2 integrate
.. //depot/projects/zfs/sys/vm/vm.h#2 integrate
.. //depot/projects/zfs/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/zfs/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/zfs/sys/vm/vm_map.c#2 integrate
.. //depot/projects/zfs/sys/vm/vm_map.h#2 integrate
.. //depot/projects/zfs/tools/build/options/WITH_BIND_LIBS#1 branch
.. //depot/projects/zfs/tools/regression/bin/sh/builtins/cd1.0#2 integrate
.. //depot/projects/zfs/tools/regression/bin/sh/builtins/cd2.0#1 branch
.. //depot/projects/zfs/tools/regression/bin/sh/builtins/fc1.0#1 branch
.. //depot/projects/zfs/tools/regression/bin/sh/builtins/trap3.0#1 branch
.. //depot/projects/zfs/tools/regression/bin/sh/errors/backquote-error1.0#2 integrate
.. //depot/projects/zfs/tools/regression/bin/sh/execution/redir1.0#1 branch
.. //depot/projects/zfs/tools/regression/bin/sh/execution/redir2.0#1 branch
.. //depot/projects/zfs/tools/regression/bpf/bpf_filter/Makefile#2 integrate
.. //depot/projects/zfs/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate
.. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate
.. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate
.. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate
.. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate
.. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0080.h#2 integrate
.. //depot/projects/zfs/tools/regression/bpf/bpf_filter/tests/test0084.h#1 branch
.. //depot/projects/zfs/tools/regression/environ/Makefile.envctl#2 integrate
.. //depot/projects/zfs/tools/regression/environ/envctl.c#2 integrate
.. //depot/projects/zfs/tools/regression/environ/envtest.t#2 integrate
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/ALIX_DSK#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/ALIX_NFS#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/etc/rc.conf#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/etc/ttys#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/.cshrc#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/.k5login#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/.login#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/change_password#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/save_cfg#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/save_sshkeys#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/updatep1#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/root/updatep2#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/Files/usr/ports/.keepme#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/alix_dsk.conf#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/alix_nfs.conf#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/build.sh#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/common.conf#1 branch
.. //depot/projects/zfs/tools/tools/nanobsd/pcengines/test.sh#1 branch
.. //depot/projects/zfs/tools/tools/tinybsd/tinybsd#2 integrate
.. //depot/projects/zfs/usr.bin/gcore/Makefile#2 integrate
.. //depot/projects/zfs/usr.bin/gcore/elfcore.c#2 integrate
.. //depot/projects/zfs/usr.bin/gcore/gcore.1#2 integrate
.. //depot/projects/zfs/usr.bin/gcore/gcore.c#2 integrate
.. //depot/projects/zfs/usr.bin/gzip/unbzip2.c#2 integrate
.. //depot/projects/zfs/usr.bin/ldd/ldd.1#2 integrate
.. //depot/projects/zfs/usr.bin/make/arch.c#2 integrate
.. //depot/projects/zfs/usr.bin/make/dir.c#2 integrate
.. //depot/projects/zfs/usr.bin/make/job.c#2 integrate
.. //depot/projects/zfs/usr.bin/netstat/if.c#2 integrate
.. //depot/projects/zfs/usr.bin/netstat/ipsec.c#2 integrate
.. //depot/projects/zfs/usr.bin/netstat/main.c#2 integrate
.. //depot/projects/zfs/usr.bin/netstat/netstat.1#2 integrate
.. //depot/projects/zfs/usr.bin/netstat/netstat.h#2 integrate
.. //depot/projects/zfs/usr.bin/perror/perror.c#2 integrate
.. //depot/projects/zfs/usr.bin/unifdef/unifdef.1#2 integrate
.. //depot/projects/zfs/usr.bin/unifdef/unifdef.c#2 integrate
.. //depot/projects/zfs/usr.bin/unifdef/unifdefall.sh#2 integrate
.. //depot/projects/zfs/usr.bin/w/w.c#2 integrate
.. //depot/projects/zfs/usr.sbin/acpi/acpidb/Makefile#2 integrate
.. //depot/projects/zfs/usr.sbin/cron/cron/cron.c#2 integrate
.. //depot/projects/zfs/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#2 integrate
.. //depot/projects/zfs/usr.sbin/inetd/inetd.c#2 integrate
.. //depot/projects/zfs/usr.sbin/jail/jail.8#2 integrate
.. //depot/projects/zfs/usr.sbin/syslogd/syslogd.c#2 integrate
Differences ...
==== //depot/projects/zfs/ObsoleteFiles.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.214 2009/12/02 15:05:26 ume 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,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20091202: unify rc.firewall and rc.firewall6.
+OLD_FILES+=etc/rc.d/ip6fw
+OLD_FILES+=etc/rc.firewall6
+# 20091117: removal of rc.early(8) link
+OLD_FILES+=usr/share/man/man8/rc.early.8.gz
# 20091027: pselect.3 implemented as syscall
OLD_FILES+=usr/share/man/man3/pselect.3.gz
# 20091005: fusword.9 and susword.9 removed
==== //depot/projects/zfs/UPDATING#2 (text+ko) ====
@@ -42,6 +42,10 @@
Applications that require wireless scan results (e.g. ifconfig(8))
from net80211 need to be recompiled.
+ Applications such as wpa_supplicant(8) may require a full world
+ build without using NO_CLEAN in order to get synchronized with the
+ new structure.
+
20091025:
The iwn(4) driver has been updated to support the 5000 and 5150 series.
There's one kernel module for each firmware. Adding "device iwnfw"
@@ -1072,4 +1076,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $
+$FreeBSD: src/UPDATING,v 1.648 2009/11/21 01:43:22 dougb Exp $
==== //depot/projects/zfs/bin/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $
+# $FreeBSD: src/bin/Makefile,v 1.29 2009/11/17 22:47:20 jilles Exp $
.include <bsd.own.mk>
@@ -27,6 +27,7 @@
pax \
pkill \
ps \
+ pwait \
pwd \
${_rcp} \
realpath \
==== //depot/projects/zfs/bin/ps/keyword.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.81 2009/11/17 07:29:35 netchild Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -330,6 +330,7 @@
errx(1, "malloc failed");
snprintf(realfmt, rflen, "%s=%s", v->alias, hp);
parsefmt(realfmt, user);
+ free(realfmt);
}
return ((VAR *)NULL);
}
==== //depot/projects/zfs/bin/sh/cd.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -70,7 +70,7 @@
STATIC char *getcomponent(void);
STATIC char *findcwd(char *);
STATIC void updatepwd(char *);
-STATIC char *getpwd2(char *, size_t);
+STATIC char *getpwd2(void);
STATIC char *curdir = NULL; /* current working directory */
STATIC char *prevdir; /* previous working directory */
@@ -263,10 +263,8 @@
* any more because we traversed a symbolic link or something
* we couldn't stat().
*/
- if (dir == NULL || curdir == NULL) {
- p = stalloc(PATH_MAX);
- return getpwd2(p, PATH_MAX);
- }
+ if (dir == NULL || curdir == NULL)
+ return getpwd2();
cdcomppath = stalloc(strlen(dir) + 1);
scopy(dir, cdcomppath);
STARTSTACKSTR(new);
@@ -313,7 +311,7 @@
int
pwdcmd(int argc, char **argv)
{
- char buf[PATH_MAX];
+ char *p;
int ch, phys;
optreset = 1; optind = 1; opterr = 0; /* initialize getopt */
@@ -341,9 +339,9 @@
out1str(curdir);
out1c('\n');
} else {
- if (getcwd(buf, sizeof(buf)) == NULL)
+ if ((p = getpwd2()) == NULL)
error(".: %s", strerror(errno));
- out1str(buf);
+ out1str(p);
out1c('\n');
}
@@ -356,36 +354,45 @@
char *
getpwd(void)
{
- char buf[PATH_MAX];
char *p;
if (curdir)
return curdir;
- p = getpwd2(buf, sizeof(buf));
+ p = getpwd2();
if (p != NULL)
curdir = savestr(p);
return curdir;
}
+#define MAXPWD 256
+
/*
* Return the current directory.
*/
STATIC char *
-getpwd2(char *buf, size_t size)
+getpwd2(void)
{
- if (getcwd(buf, size) == NULL) {
- char *pwd = getenv("PWD");
- struct stat stdot, stpwd;
+ struct stat stdot, stpwd;
+ char *pwd;
+ int i;
- if (pwd && *pwd == '/' && stat(".", &stdot) != -1 &&
- stat(pwd, &stpwd) != -1 &&
- stdot.st_dev == stpwd.st_dev &&
- stdot.st_ino == stpwd.st_ino) {
+ for (i = MAXPWD;; i *= 2) {
+ pwd = stalloc(i);
+ if (getcwd(pwd, i) != NULL)
return pwd;
- }
- return NULL;
+ stunalloc(pwd);
+ if (errno != ERANGE)
+ break;
+ }
+
+ pwd = getenv("PWD");
+ if (pwd && *pwd == '/' && stat(".", &stdot) != -1 &&
+ stat(pwd, &stpwd) != -1 &&
+ stdot.st_dev == stpwd.st_dev &&
+ stdot.st_ino == stpwd.st_ino) {
+ return pwd;
}
- return buf;
+ return NULL;
}
==== //depot/projects/zfs/bin/sh/error.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $");
/*
* Errors and exceptions.
@@ -73,11 +73,15 @@
* Called to raise an exception. Since C doesn't include exceptions, we
* just do a longjmp to the exception handler. The type of exception is
* stored in the global variable "exception".
+ *
+ * Interrupts are disabled; they should be reenabled when the exception is
+ * caught.
*/
void
exraise(int e)
{
+ INTOFF;
if (handler == NULL)
abort();
exception = e;
@@ -138,8 +142,15 @@
static void
exverror(int cond, const char *msg, va_list ap)
{
- CLEAR_PENDING_INT;
- INTOFF;
+ /*
+ * An interrupt trumps an error. Certain places catch error
+ * exceptions or transform them to a plain nonzero exit code
+ * in child processes, and if an error exception can be handled,
+ * an interrupt can be handled as well.
+ *
+ * exraise() will disable interrupts for the exception handler.
+ */
+ FORCEINTON;
#ifdef DEBUG
if (msg)
==== //depot/projects/zfs/bin/sh/error.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)error.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/error.h,v 1.17 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $
*/
/*
@@ -72,6 +72,8 @@
#define INTOFF suppressint++
#define INTON { if (--suppressint == 0 && intpending) onint(); }
+#define is_int_on() suppressint
+#define SETINTON(s) suppressint = (s)
#define FORCEINTON {suppressint = 0; if (intpending) onint();}
#define CLEAR_PENDING_INT intpending = 0
#define int_pending() intpending
==== //depot/projects/zfs/bin/sh/eval.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.70 2009/11/29 22:33:59 jilles Exp $");
#include <paths.h>
#include <signal.h>
@@ -593,6 +593,7 @@
char *savecmdname;
struct shparam saveparam;
struct localvar *savelocalvars;
+ struct parsefile *savetopfile;
volatile int e;
char *lastarg;
int realstatus;
@@ -781,7 +782,6 @@
savelocalvars = localvars;
localvars = NULL;
reffunc(cmdentry.u.func);
- INTON;
savehandler = handler;
if (setjmp(jmploc.loc)) {
if (exception == EXSHELLPROC)
@@ -797,6 +797,7 @@
longjmp(handler->loc, 1);
}
handler = &jmploc;
+ INTON;
for (sp = varlist.list ; sp ; sp = sp->next)
mklocal(sp->text);
funcnest++;
@@ -833,6 +834,7 @@
mode |= REDIR_BACKQ;
}
savecmdname = commandname;
+ savetopfile = getcurrentfile();
cmdenviron = varlist.list;
e = -1;
savehandler = handler;
@@ -867,6 +869,7 @@
if ((e != EXERROR && e != EXEXEC)
|| cmdentry.special)
exraise(e);
+ popfilesupto(savetopfile);
FORCEINTON;
}
if (cmdentry.u.index != EXECCMD)
@@ -880,7 +883,6 @@
#ifdef DEBUG
trputs("normal command: "); trargs(argv);
#endif
- clearredir();
redirect(cmd->ncmd.redirect, 0);
for (sp = varlist.list ; sp ; sp = sp->next)
setvareq(sp->text, VEXPORT|VSTACK);
==== //depot/projects/zfs/bin/sh/histedit.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.31 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.32 2009/11/21 14:28:32 jilles Exp $");
#include <sys/param.h>
#include <limits.h>
@@ -92,7 +92,7 @@
if (hist != NULL)
sethistsize(histsizeval());
else
- out2str("sh: can't initialize history\n");
+ out2fmt_flush("sh: can't initialize history\n");
}
if (editing && !el && isatty(0)) { /* && isatty(2) ??? */
/*
@@ -114,7 +114,7 @@
el_set(el, EL_PROMPT, getprompt);
} else {
bad:
- out2str("sh: can't initialize editing\n");
+ out2fmt_flush("sh: can't initialize editing\n");
}
INTON;
} else if (!editing && el) {
@@ -336,6 +336,7 @@
if (sflg) {
if (displayhist) {
out2str(s);
+ flushout(out2);
}
evalstring(s, 0);
if (displayhist && hist) {
==== //depot/projects/zfs/bin/sh/input.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.25 2009/06/17 21:58:32 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.27 2009/11/22 14:04:20 jilles Exp $");
#include <stdio.h> /* defines BUFSIZ */
#include <fcntl.h>
@@ -215,7 +215,7 @@
if (flags >= 0 && flags & O_NONBLOCK) {
flags &=~ O_NONBLOCK;
if (fcntl(0, F_SETFL, flags) >= 0) {
- out2str("sh: turning off NDELAY mode\n");
+ out2fmt_flush("sh: turning off NDELAY mode\n");
goto retry;
}
}
@@ -359,7 +359,7 @@
struct strpush *sp;
INTOFF;
-/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
+/*out2fmt_flush("*** calling pushstring: %s, %d\n", s, len);*/
if (parsefile->strpush) {
sp = ckmalloc(sizeof (struct strpush));
sp->prev = parsefile->strpush;
@@ -386,7 +386,7 @@
parsenextc = sp->prevstring;
parsenleft = sp->prevnleft;
parselleft = sp->prevlleft;
-/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+/*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/
if (sp->ap)
sp->ap->flag &= ~ALIASINUSE;
parsefile->strpush = sp->prev;
@@ -509,6 +509,32 @@
/*
+ * Return current file (to go back to it later using popfilesupto()).
+ */
+
+struct parsefile *
+getcurrentfile(void)
+{
+ return parsefile;
+}
+
+
+/*
+ * Pop files until the given file is on top again. Useful for regular
+ * builtins that read shell commands from files or strings.
+ * If the given file is not an active file, an error is raised.
+ */
+
+void
+popfilesupto(struct parsefile *file)
+{
+ while (parsefile != file && parsefile != &basepf)
+ popfile();
+ if (parsefile != file)
+ error("popfilesupto() misused");
+}
+
+/*
* Return to top level.
*/
==== //depot/projects/zfs/bin/sh/input.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)input.h 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/input.h,v 1.10 2009/06/13 21:17:45 jilles Exp $
+ * $FreeBSD: src/bin/sh/input.h,v 1.11 2009/11/22 14:04:20 jilles Exp $
*/
/* PEOF (the end of file marker) is defined in syntax.h */
@@ -45,6 +45,8 @@
extern char *parsenextc; /* next character in input buffer */
extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */
+struct parsefile;
+
char *pfgets(char *, int);
int pgetc(void);
int preadbuffer(void);
@@ -56,6 +58,8 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list