Date: Wed, 11 Jun 2008 05:37:22 GMT From: Weongyo Jeong <weongyo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 143274 for review Message-ID: <200806110537.m5B5bMaH037636@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=143274 Change 143274 by weongyo@weongyo_ws on 2008/06/11 05:36:43 IFC Affected files ... .. //depot/projects/ndisusb/LOCKS#2 integrate .. //depot/projects/ndisusb/MAINTAINERS#2 integrate .. //depot/projects/ndisusb/ObsoleteFiles.inc#2 integrate .. //depot/projects/ndisusb/UPDATING#2 integrate .. //depot/projects/ndisusb/bin/ln/ln.1#2 integrate .. //depot/projects/ndisusb/bin/ln/ln.c#2 integrate .. //depot/projects/ndisusb/bin/sh/alias.c#2 integrate .. //depot/projects/ndisusb/bin/sh/parser.c#2 integrate .. //depot/projects/ndisusb/contrib/binutils/bfd/coff-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/cpu-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/elf32-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/elf64-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/elfn32-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/elfxx-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/elfxx-mips.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/hosts/news-mips.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/mipsbsd.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/pe-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/bfd/pei-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/gas/config/e-mipsecoff.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/gas/config/e-mipself.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/gas/config/itbl-mips.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/gas/config/tc-mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/gas/config/tc-mips.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/gas/config/te-tmips.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/gas/doc/c-mips.texi#1 branch .. //depot/projects/ndisusb/contrib/binutils/gprof/mips.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/include/coff/mips.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/include/coff/mipspe.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/include/opcode/mips.h#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/mipsbig.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/mipsbsd.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/mipsidt.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/mipsidtl.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/mipslit.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/mipslnews.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/mipspe.sh#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emultempl/mipsecoff.em#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/emultempl/mipself.em#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/scripttempl/mips.sc#1 branch .. //depot/projects/ndisusb/contrib/binutils/ld/scripttempl/mipsbsd.sc#1 branch .. //depot/projects/ndisusb/contrib/binutils/opcodes/mips-dis.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/opcodes/mips-opc.c#1 branch .. //depot/projects/ndisusb/contrib/binutils/opcodes/mips16-opc.c#1 branch .. //depot/projects/ndisusb/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/FREEBSD-vendor#2 integrate .. //depot/projects/ndisusb/etc/rc.d/Makefile#2 integrate .. //depot/projects/ndisusb/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/ndisusb/etc/rc.d/defaultroute#1 branch .. //depot/projects/ndisusb/etc/rc.d/routing#2 integrate .. //depot/projects/ndisusb/etc/rc.firewall#2 integrate .. //depot/projects/ndisusb/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/ndisusb/games/morse/morse.6#2 integrate .. //depot/projects/ndisusb/games/morse/morse.c#2 integrate .. //depot/projects/ndisusb/include/pthread.h#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/ndisusb/lib/libc/include/namespace.h#2 integrate .. //depot/projects/ndisusb/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/ndisusb/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/ndisusb/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/ndisusb/lib/libc/sys/fcntl.c#2 integrate .. //depot/projects/ndisusb/lib/libc_r/uthread/uthread_fcntl.c#2 integrate .. //depot/projects/ndisusb/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/ndisusb/lib/libthr/pthread.map#2 integrate .. //depot/projects/ndisusb/lib/libthr/thread/thr_clean.c#2 integrate .. //depot/projects/ndisusb/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/ndisusb/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/ndisusb/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/ndisusb/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/ndisusb/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/ndisusb/libexec/rpc.rstatd/Makefile#2 integrate .. //depot/projects/ndisusb/libexec/rpc.rstatd/rstat_proc.c#2 integrate .. //depot/projects/ndisusb/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/ndisusb/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/ndisusb/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/ndisusb/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/ndisusb/sbin/Makefile#2 integrate .. //depot/projects/ndisusb/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/ndisusb/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/ndisusb/sbin/geom/Makefile#2 integrate .. //depot/projects/ndisusb/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/ndisusb/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/ndisusb/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/ndisusb/sbin/geom/core/geom.c#2 integrate .. //depot/projects/ndisusb/sbin/geom/misc/subr.c#2 integrate .. //depot/projects/ndisusb/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/ndisusb/sbin/mount/mount.8#2 integrate .. //depot/projects/ndisusb/sbin/natd/natd.c#2 integrate .. //depot/projects/ndisusb/sbin/rcorder/rcorder.8#2 integrate .. //depot/projects/ndisusb/share/man/man4/ciss.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/ddb.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/ubsa.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/uplcom.4#2 integrate .. //depot/projects/ndisusb/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/ndisusb/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/ndisusb/share/sendmail/Makefile#2 integrate .. //depot/projects/ndisusb/share/syscons/keymaps/colemak.iso15.acc.kbd#2 integrate .. //depot/projects/ndisusb/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/ndisusb/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/ndisusb/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/GUMSTIX#1 branch .. //depot/projects/ndisusb/sys/arm/conf/GUMSTIX.hints#1 branch .. //depot/projects/ndisusb/sys/arm/include/intr.h#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/pxa/files.pxa#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/if_smc_smi.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxa_gpio.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxa_icu.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxa_machdep.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxa_obio.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxa_smi.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxa_space.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxa_timer.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxareg.h#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxavar.h#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/std.pxa#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/uart_bus_pxa.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/uart_cpu_pxa.c#1 branch .. //depot/projects/ndisusb/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/ndisusb/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/ndisusb/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/ndisusb/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/ndisusb/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/ndisusb/sys/conf/NOTES#2 integrate .. //depot/projects/ndisusb/sys/conf/files#2 integrate .. //depot/projects/ndisusb/sys/conf/files.powerpc#2 integrate .. //depot/projects/ndisusb/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/ndisusb/sys/conf/newvers.sh#2 integrate .. //depot/projects/ndisusb/sys/conf/options.arm#2 integrate .. //depot/projects/ndisusb/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/ndisusb/sys/dev/age/if_age.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/ndisusb/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/ndisusb/sys/dev/bm/if_bm.c#1 branch .. //depot/projects/ndisusb/sys/dev/bm/if_bmreg.h#1 branch .. //depot/projects/ndisusb/sys/dev/bm/if_bmvar.h#1 branch .. //depot/projects/ndisusb/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/ndisusb/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/ndisusb/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/ndisusb/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/ndisusb/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/ndisusb/sys/dev/cs/if_csreg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/ndisusb/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/ndisusb/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/ndisusb/sys/dev/fe/if_fevar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ichsmb/ichsmb_var.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ie/if_ievar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/ndisusb/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/ndisusb/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/ndisusb/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/ndisusb/sys/dev/led/led.c#2 integrate .. //depot/projects/ndisusb/sys/dev/md/md.c#2 integrate .. //depot/projects/ndisusb/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/ndisusb/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/ndisusb/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/ndisusb/sys/dev/mii/miidevs#2 integrate .. //depot/projects/ndisusb/sys/dev/mii/smcphy.c#1 branch .. //depot/projects/ndisusb/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/ndisusb/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/ndisusb/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/ndisusb/sys/dev/si/si.c#2 integrate .. //depot/projects/ndisusb/sys/dev/si/si.h#2 integrate .. //depot/projects/ndisusb/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/ndisusb/sys/dev/smc/if_smc.c#1 branch .. //depot/projects/ndisusb/sys/dev/smc/if_smcreg.h#1 branch .. //depot/projects/ndisusb/sys/dev/smc/if_smcvar.h#1 branch .. //depot/projects/ndisusb/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/ndisusb/sys/dev/snc/dp83932subr.c#2 integrate .. //depot/projects/ndisusb/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/ndisusb/sys/dev/snc/if_sncreg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/ndisusb/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/ndisusb/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xe/if_xevar.h#2 integrate .. //depot/projects/ndisusb/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/ndisusb/sys/geom/geom_dev.c#2 integrate .. //depot/projects/ndisusb/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/ndisusb/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/ndisusb/sys/kern/kern_conf.c#2 integrate .. //depot/projects/ndisusb/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/ndisusb/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/ndisusb/sys/kern/tty_tty.c#2 integrate .. //depot/projects/ndisusb/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/ndisusb/sys/kern/vfs_export.c#2 integrate .. //depot/projects/ndisusb/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/ndisusb/sys/mips/include/pte.h#2 integrate .. //depot/projects/ndisusb/sys/mips/mips/trap.c#2 integrate .. //depot/projects/ndisusb/sys/modules/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/bm/Makefile#1 branch .. //depot/projects/ndisusb/sys/modules/cnw/Makefile#1 branch .. //depot/projects/ndisusb/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/ndisusb/sys/net/radix_mpath.c#2 integrate .. //depot/projects/ndisusb/sys/net/radix_mpath.h#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/ndisusb/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/ndisusb/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/ndisusb/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/ndisusb/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/ndisusb/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/ndisusb/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/ndisusb/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/ndisusb/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/ndisusb/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/ndisusb/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/ndisusb/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/ndisusb/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/ndisusb/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/ndisusb/sys/pci/amdpm.c#2 integrate .. //depot/projects/ndisusb/sys/pci/amdsmb.c#2 integrate .. //depot/projects/ndisusb/sys/pci/if_xl.c#2 integrate .. //depot/projects/ndisusb/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/ndisusb/sys/pci/intpm.c#2 integrate .. //depot/projects/ndisusb/sys/pci/nfsmb.c#2 integrate .. //depot/projects/ndisusb/sys/pci/viapm.c#2 integrate .. //depot/projects/ndisusb/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/ndisusb/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/ndisusb/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/ndisusb/sys/powerpc/include/dbdma.h#1 branch .. //depot/projects/ndisusb/sys/powerpc/powermac/dbdma.c#1 branch .. //depot/projects/ndisusb/sys/powerpc/powermac/dbdmavar.h#1 branch .. //depot/projects/ndisusb/sys/security/audit/audit.c#2 integrate .. //depot/projects/ndisusb/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/ndisusb/sys/sys/conf.h#2 integrate .. //depot/projects/ndisusb/sys/sys/mount.h#2 integrate .. //depot/projects/ndisusb/sys/sys/ttydefaults.h#2 integrate .. //depot/projects/ndisusb/sys/vm/vm_page.c#2 integrate .. //depot/projects/ndisusb/tools/tools/mctest/mctest.1#2 integrate .. //depot/projects/ndisusb/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/ndisusb/tools/tools/mctest/mctest_run.sh#2 integrate .. //depot/projects/ndisusb/usr.bin/comm/comm.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/ccl.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/dfa.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/ecs.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/flex.skl#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/flexdef.h#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/gen.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/initscan.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/lex.1#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/misc.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/nfa.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/parse.y#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/scan.l#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/sym.c#2 integrate .. //depot/projects/ndisusb/usr.bin/lex/tblcmp.c#2 integrate .. //depot/projects/ndisusb/usr.bin/rev/rev.c#2 integrate .. //depot/projects/ndisusb/usr.bin/su/su.c#2 integrate .. //depot/projects/ndisusb/usr.bin/tar/subst.c#2 integrate .. //depot/projects/ndisusb/usr.bin/tar/util.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/config/Makefile#2 integrate .. //depot/projects/ndisusb/usr.sbin/config/mkmakefile.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/jexec/jexec.8#2 integrate .. //depot/projects/ndisusb/usr.sbin/jexec/jexec.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/Makefile#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/add/pkg_add.1#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/updating/main.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/ndisusb/usr.sbin/ppp/physical.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/rpc.lockd/lockd.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/setfib/setfib.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/sicontrol/Makefile#2 integrate .. //depot/projects/ndisusb/usr.sbin/sicontrol/sicontrol.8#2 integrate .. //depot/projects/ndisusb/usr.sbin/sicontrol/sicontrol.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/timed/timed/timed.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/tzsetup/paths.h#2 delete .. //depot/projects/ndisusb/usr.sbin/tzsetup/tzsetup.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/wlandebug/wlandebug.c#2 integrate Differences ... ==== //depot/projects/ndisusb/LOCKS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/LOCKS,v 1.4 2008/01/24 22:07:03 cperciva Exp $ +$FreeBSD: src/LOCKS,v 1.5 2008/06/05 19:47:58 peter Exp $ This file documents formal review/approval requirements that have been approved by core. @@ -7,7 +7,7 @@ -------------------------------------- Special cases: -src/* RELENG_4_* Requires Security Officer approval. -src/* RELENG_5_* Requires Security Officer approval. -src/* RELENG_6_* Requires Security Officer approval. -src/* RELENG_7_* Requires Security Officer approval. +releng/4.* Requires Security Officer approval. +releng/5.* Requires Security Officer approval. +releng/6.* Requires Security Officer approval. +releng/7.* Requires Security Officer approval. ==== //depot/projects/ndisusb/MAINTAINERS#2 (text+ko) ==== @@ -1,8 +1,8 @@ -$FreeBSD: src/MAINTAINERS,v 1.147 2008/05/27 06:50:46 peter Exp $ +$FreeBSD: src/MAINTAINERS,v 1.150 2008/06/06 21:32:01 peter Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements -are granted by core. These are documented in src/LOCKS and enforced +are granted by core. These are documented in head/LOCKS and enforced by CVSROOT/approvers. The source tree is a community effort. However, some folks go to the @@ -71,7 +71,6 @@ ps gad I am working on a number of changes to this. Would like advance notice of major changes planned to it. cvs peter Heads-up appreciated, try not to break it. -ncurses peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. @@ -127,6 +126,7 @@ gnu/usr.bin/send-pr bugmaster Pre-commit review requested. BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. usb core Please contact core@ before any major changes +ncurses rafan Heads-up appreciated, try not to break it. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/ndisusb/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.141 2008/05/27 21:05:49 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.142 2008/06/09 21:36:46 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080609: gpt(8) removed +OLD_FILES+=sbin/gpt +OLD_FILES+=usr/share/man/man8/gpt.8.gz # 20080525: I4B removed OLD_FILES+=etc/isdn/answer OLD_FILES+=etc/isdn/isdntel ==== //depot/projects/ndisusb/UPDATING#2 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080609: + The gpt(8) utility has been removed. Use gpart(8) to partition + disks instead. + +20080603: + The version that Linuxulator emulates was changed from 2.4.2 + to 2.6.16. If you experience any problems with Linux binaries + please try to set sysctl compat.linux.osrelease to 2.4.2 and + if it fixes the problem contact emulation mailing list. + 20080525: ISDN4BSD (I4B) was removed from the src tree. You may need to update a your kernel configuration and remove relevant entries. @@ -1043,4 +1053,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.529 2008/05/26 10:39:45 bz Exp $ +$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $ ==== //depot/projects/ndisusb/bin/ln/ln.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.32 2007/11/17 21:01:22 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.33 2008/06/06 08:27:59 keramida Exp $ .\" -.Dd February 14, 2006 +.Dd June 6, 2008 .Dt LN 1 .Os .Sh NAME @@ -42,13 +42,13 @@ .Sh SYNOPSIS .Nm .Op Fl s Op Fl F -.Op Fl f | i +.Op Fl f | iw .Op Fl hnv .Ar source_file .Op Ar target_file .Nm .Op Fl s Op Fl F -.Op Fl f | i +.Op Fl f | iw .Op Fl hnv .Ar source_file ... .Ar target_dir @@ -79,6 +79,8 @@ .Fl f option overrides any previous .Fl i +and +.Fl w options.) .It Fl F If the target file already exists and is a directory, then remove it @@ -134,6 +136,8 @@ Cause .Nm to be verbose, showing files as they are processed. +.It Fl w +Warn if the source of a symbolic link does not currently exist. .El .Pp By default, @@ -194,9 +198,10 @@ The .Fl h , .Fl i , -.Fl n +.Fl n , +.Fl v and -.Fl v +.Fl w options are non-standard and their use in scripts is not recommended. They are provided solely for compatibility with other .Nm ==== //depot/projects/ndisusb/bin/ln/ln.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.36 2007/11/17 21:01:22 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.38 2008/06/07 09:37:30 keramida Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -58,6 +58,8 @@ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ int vflag; /* Verbose output. */ +int wflag; /* Warn if symlink target does not + * exist, and -f is not enabled. */ /* System link call. */ int (*linkf)(const char *, const char *); char linkch; @@ -92,7 +94,7 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsvw")) != -1) switch (ch) { case 'F': Fflag = 1; @@ -100,6 +102,7 @@ case 'f': fflag = 1; iflag = 0; + wflag = 0; break; case 'h': case 'n': @@ -115,6 +118,9 @@ case 'v': vflag = 1; break; + case 'w': + wflag = 1; + break; case '?': default: usage(); @@ -127,8 +133,10 @@ linkch = sflag ? '-' : '='; if (sflag == 0) Fflag = 0; - if (Fflag == 1 && iflag == 0) + if (Fflag == 1 && iflag == 0) { fflag = 1; + wflag = 0; /* Implied when fflag != 0 */ + } switch(argc) { case 0: @@ -167,6 +175,7 @@ const char *p; int ch, exists, first; char path[PATH_MAX]; + char wbuf[PATH_MAX]; if (!sflag) { /* If source doesn't exist, quit now. */ @@ -204,6 +213,32 @@ exists = !lstat(target, &sb); /* + * If the link source doesn't exist, and a symbolic link was + * requested, and -w was specified, give a warning. + */ + if (sflag && wflag) { + if (*source == '/') { + /* Absolute link source. */ + if (stat(source, &sb) != 0) + warn("warning: %s inaccessible", source); + } else { + /* + * Relative symlink source. Try to construct the + * absolute path of the source, by appending `source' + * to the parent directory of the target. + */ + p = strrchr(target, '/'); + if (p != NULL) + p++; + else + p = target; + (void)snprintf(wbuf, sizeof(wbuf), "%.*s%s", + (int)(p - target), target, source); + if (stat(wbuf, &sb) != 0) + warn("warning: %s", source); + } + } + /* * If the file exists, then unlink it forcibly if -f was specified * and interactively if -i was specified. */ ==== //depot/projects/ndisusb/bin/sh/alias.c#2 (text+ko) ==== @@ -36,11 +36,10 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.20 2005/09/02 22:43:28 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.22 2008/06/07 16:28:20 rse Exp $"); #include <stdlib.h> #include "shell.h" -#include "input.h" #include "output.h" #include "error.h" #include "memalloc.h" @@ -53,8 +52,8 @@ STATIC struct alias *atab[ATABSIZE]; STATIC void setalias(char *, char *); -STATIC int unalias(char *); -STATIC struct alias **hashalias(char *); +STATIC int unalias(const char *); +STATIC struct alias **hashalias(const char *); STATIC void @@ -111,7 +110,7 @@ } STATIC int -unalias(char *name) +unalias(const char *name) { struct alias *ap, **app; @@ -248,7 +247,7 @@ } STATIC struct alias ** -hashalias(char *p) +hashalias(const char *p) { unsigned int hashval; ==== //depot/projects/ndisusb/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.60 2008/05/28 21:44:32 stefanf Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1188,6 +1188,7 @@ int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ int i; int linno; + int length; c = pgetc(); if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) && @@ -1220,12 +1221,14 @@ subtype = 0; } if (!is_eof(c) && is_name(c)) { - p = out; + length = 0; do { STPUTC(c, out); c = pgetc(); + length++; } while (!is_eof(c) && is_in_name(c)); - if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) { + if (length == 6 && + strncmp(out - length, "LINENO", length) == 0) { /* Replace the variable name with the * current line number. */ linno = plinno; ==== //depot/projects/ndisusb/contrib/cvs/src/classify.c#2 (text+ko) ==== @@ -34,11 +34,14 @@ aflag /* ...and... */ && (/* ...there used to be a tag which subs in Name keys... */ - (vers->entdata->tag && !isdigit (vers->entdata->tag[0])) + (vers->entdata->tag && !isdigit (vers->entdata->tag[0]) + && vers->tag && !isdigit (vers->tag[0]) + && strcmp (vers->entdata->tag, vers->tag)) /* ...or there used to be a keyword mode which may be * changed by -A... */ || (strlen (vers->entdata->options) + && strcmp (vers->entdata->options, vers->options) && strcmp (vers->entdata->options, "-kkv") && strcmp (vers->entdata->options, "-kb")))) /* ...or... */ ==== //depot/projects/ndisusb/contrib/ncurses/FREEBSD-vendor#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/contrib/ncurses/FREEBSD-vendor,v 1.2 2008/05/09 02:30:24 rafan Exp $ +# $FreeBSD: src/contrib/ncurses/FREEBSD-vendor,v 1.3 2008/06/04 07:38:38 rafan Exp $ Project: Ncurses (new curses) library ProjectURL: http://www.gnu.org/software/ncurses/ Version: 5.6-20080503 snapshot VendorTag: NCURSES VersionTag: v5_6_20080503 License: MIT-like -Maintainer: peter, rafan +Maintainer: rafan ==== //depot/projects/ndisusb/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.91 2008/05/26 10:39:46 bz Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.92 2008/06/05 17:26:47 brooks Exp $ .include <bsd.own.mk> @@ -7,7 +7,7 @@ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ - ddb devd devfs dhclient \ + ddb defaultroute devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ fsck ftp-proxy ftpd \ ==== //depot/projects/ndisusb/etc/rc.d/NETWORKING#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.15 2008/05/26 10:39:46 bz Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.16 2008/06/05 17:26:47 brooks Exp $ # # PROVIDE: NETWORKING NETWORK # REQUIRE: netif netoptions routing network_ipv6 ppp -# REQUIRE: routed mrouted route6d mroute6d resolv +# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv # This is a dummy dependency, for services which require networking # to be operational before starting. ==== //depot/projects/ndisusb/etc/rc.d/routing#2 (text+ko) ==== @@ -2,11 +2,11 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.144 2008/05/18 02:57:54 brooks Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.145 2008/06/05 17:26:47 brooks Exp $ # # PROVIDE: routing -# REQUIRE: devd netif ppp +# REQUIRE: netif ppp # KEYWORD: nojail . /etc/rc.subr @@ -23,31 +23,6 @@ { static_start options_start - - # Return without waiting if we don't have dhcp interfaces. - # Once we can test that the link is actually up, we should - # remove this test and always wait. - dhcp_interfaces=`list_net_interfaces dhcp` - [ -z "`list_net_interfaces dhcp`" ] && return - - # Wait for a default route - delay=${if_up_delay} - while [ ${delay} -gt 0 ]; do - defif=`get_default_if -inet` - if [ -n "${defif}" ]; then - if [ ${delay} -ne ${if_up_delay} ]; then - echo "($defif)" - fi - break - fi - if [ ${delay} -eq ${if_up_delay} ]; then - echo -n "Waiting ${delay}s for an interface to come up: " - else - echo -n . - fi - sleep 1 - delay=`expr $delay - 1` - done } routing_stop() ==== //depot/projects/ndisusb/etc/rc.firewall#2 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.54 2008/01/21 04:41:17 rafan Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.55 2008/06/06 07:17:04 keramida Exp $ # # @@ -171,6 +171,9 @@ mask="255.255.255.0" ip="192.0.2.1" + # Allow limited broadcast traffic from my own net. + ${fwcmd} add pass all from ${net}:${mask} to 255.255.255.255 + # Allow any traffic to or from my own net. ${fwcmd} add pass all from ${ip} to ${net}:${mask} ${fwcmd} add pass all from ${net}:${mask} to ${ip} ==== //depot/projects/ndisusb/games/fortune/datfiles/freebsd-tips#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.45 2007/12/08 00:20:33 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.46 2008/05/31 18:07:16 remko Exp $ % Any user that is a member of the wheel group can use "su -" to simulate a root login. You can add a user to the wheel group by editing /etc/group. @@ -402,16 +402,6 @@ as root. This will install a collection of packages that is appropriate for running a "generic" server. % -You can get a good standard workstation install by using the -instant-workstation port/package. If you have ports installed, you can -install it by doing - - # cd /usr/ports/misc/instant-workstation - # make install && make clean - -as root. This will install a collection of packages that is convenient to -have on a workstation. -% You can install extra packages for FreeBSD by using the ports system. If you have installed it, you can download, compile, and install software by just typing ==== //depot/projects/ndisusb/games/morse/morse.6#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)bcd.6 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/games/morse/morse.6,v 1.17 2005/06/07 21:43:16 ru Exp $ +.\" $FreeBSD: src/games/morse/morse.6,v 1.18 2008/06/08 19:35:47 scf Exp $ .\" .Dd June 7, 2005 .Dt MORSE 6 @@ -172,7 +172,8 @@ .Sh FILES .Bl -tag -width ".Pa /dev/speaker" -compact .It Pa /dev/speaker -speaker device file +.Xr speaker 4 +device file .El .Sh SEE ALSO .Xr speaker 4 @@ -180,7 +181,7 @@ Sound support for .Nm added by -.An Lyndon Nerenberg (VE7TCP/VE6BBM) Aq lyndon@orthanc.com . +.An Lyndon Nerenberg (VE6BBM) Aq lyndon@orthanc.ca . .Pp Ability to key an external device added by .An J\(:org Wunsch ==== //depot/projects/ndisusb/games/morse/morse.c#2 (text+ko) ==== @@ -32,8 +32,8 @@ */ /* - * Taught to send *real* morse by Lyndon Nerenberg (VE7TCP/VE6BBM) - * <lyndon@orthanc.com> + * Taught to send *real* morse by Lyndon Nerenberg (VE6BBM) + * <lyndon@orthanc.ca> */ #ifndef lint @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/morse/morse.c,v 1.21 2005/11/11 09:57:32 ru Exp $"; + "$FreeBSD: src/games/morse/morse.c,v 1.22 2008/06/08 19:35:47 scf Exp $"; #endif /* not lint */ #include <sys/time.h> @@ -483,7 +483,8 @@ printf(" %s\n", s); } else { for (; *s; ++s) - printf(" %s", *s == '.' ? "dit" : "dah"); + printf(" %s", *s == '.' ? *(s + 1) == '\0' ? "dit" : + "di" : "dah"); printf("\n"); } } ==== //depot/projects/ndisusb/include/pthread.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.42 2008/03/22 09:59:20 davidxu Exp $ + * $FreeBSD: src/include/pthread.h,v 1.43 2008/06/09 01:14:10 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -135,6 +135,10 @@ #define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_ERRORCHECK +struct _pthread_cleanup_info { + __uintptr_t pthread_cleanup_pad[8]; +}; + /* * Thread function prototype definitions: */ @@ -162,8 +166,19 @@ int *); int pthread_barrierattr_init(pthread_barrierattr_t *); int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int); -void pthread_cleanup_pop(int); -void pthread_cleanup_push(void (*) (void *), void *); + +#define pthread_cleanup_push(cleanup_routine, cleanup_arg) \ + { \ + struct _pthread_cleanup_info __cleanup_info__; \ + __pthread_cleanup_push_imp(cleanup_routine, cleanup_arg,\ + &__cleanup_info__); \ + { + +#define pthread_cleanup_pop(execute) \ + } \ + __pthread_cleanup_pop_imp(execute); \ + } + int pthread_condattr_destroy(pthread_condattr_t *); int pthread_condattr_getclock(const pthread_condattr_t *, clockid_t *); @@ -268,6 +283,10 @@ const struct sched_param *); int pthread_getconcurrency(void); int pthread_setconcurrency(int); + +void __pthread_cleanup_push_imp(void (*)(void *), void *, + struct _pthread_cleanup_info *); +void __pthread_cleanup_pop_imp(int); __END_DECLS #endif ==== //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_mtree.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.6 2008/05/26 17:00:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.7 2008/06/09 14:44:56 cperciva Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -308,7 +308,7 @@ size_t len; line += 6; - if ((next = strchr(line, '=')) != NULL) { + if (strchr(line, '=') != NULL) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "/unset shall not contain `='"); return ARCHIVE_FATAL; @@ -759,7 +759,7 @@ } ++comma1; comma2 = strchr(comma1, ','); - if (comma1 == NULL) { + if (comma2 == NULL) { archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806110537.m5B5bMaH037636>