From owner-p4-projects@FreeBSD.ORG Wed Aug 10 18:45:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE23816A421; Wed, 10 Aug 2005 18:45:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA2FE16A41F for ; Wed, 10 Aug 2005 18:45:17 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B69343D45 for ; Wed, 10 Aug 2005 18:45:17 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AIjHBY054437 for ; Wed, 10 Aug 2005 18:45:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7AIjFj3054424 for perforce@freebsd.org; Wed, 10 Aug 2005 18:45:15 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Aug 2005 18:45:15 GMT Message-Id: <200508101845.j7AIjFj3054424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 18:45:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=81798 Change 81798 by sam@sam_ebb on 2005/08/10 18:44:24 IFC @ 81797 Affected files ... .. //depot/projects/wifi/MAINTAINERS#8 integrate .. //depot/projects/wifi/etc/Makefile#8 integrate .. //depot/projects/wifi/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/wifi/etc/portsnap.conf#1 branch .. //depot/projects/wifi/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes2-o#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_data_into_fd.c#3 integrate .. //depot/projects/wifi/lib/libarchive/configure.ac.in#6 integrate .. //depot/projects/wifi/lib/libdevstat/devstat.3#4 integrate .. //depot/projects/wifi/lib/libedit/chared.c#3 integrate .. //depot/projects/wifi/lib/libedit/chared.h#3 integrate .. //depot/projects/wifi/lib/libedit/common.c#3 integrate .. //depot/projects/wifi/lib/libedit/editline.3#4 integrate .. //depot/projects/wifi/lib/libedit/emacs.c#3 integrate .. //depot/projects/wifi/lib/libedit/key.c#3 integrate .. //depot/projects/wifi/lib/libedit/sys.h#3 integrate .. //depot/projects/wifi/lib/libedit/term.c#3 integrate .. //depot/projects/wifi/lib/libedit/vi.c#3 integrate .. //depot/projects/wifi/lib/libmemstat/libmemstat.3#6 integrate .. //depot/projects/wifi/share/man/man4/nge.4#5 integrate .. //depot/projects/wifi/share/man/man4/nve.4#5 integrate .. //depot/projects/wifi/share/man/man4/pcvt.4#4 integrate .. //depot/projects/wifi/share/man/man5/Makefile#5 integrate .. //depot/projects/wifi/share/man/man5/portsnap.conf.5#1 branch .. //depot/projects/wifi/share/man/man9/bios.9#3 integrate .. //depot/projects/wifi/share/man/man9/bus_alloc_resource.9#4 integrate .. //depot/projects/wifi/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/wifi/sys/coda/coda_fbsd.c#6 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/wifi/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/wifi/sys/ddb/db_command.c#5 integrate .. //depot/projects/wifi/sys/dev/aac/aac_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/an/if_an.c#7 integrate .. //depot/projects/wifi/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/wifi/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#15 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#15 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#100 integrate .. //depot/projects/wifi/sys/dev/awi/awi.c#12 integrate .. //depot/projects/wifi/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/wifi/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/wifi/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/wifi/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/wifi/sys/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed.c#11 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#13 integrate .. //depot/projects/wifi/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/en/midway.c#4 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep.c#8 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/wifi/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/wifi/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_intr.c#5 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_ioctl.c#4 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_rx.c#4 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_tx.c#5 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/wifi/sys/dev/ie/if_ie.c#4 integrate .. //depot/projects/wifi/sys/dev/ieee488/upd7210.h#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#20 integrate .. //depot/projects/wifi/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/wifi/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/wifi/sys/dev/ixgb/if_ixgb.c#9 integrate .. //depot/projects/wifi/sys/dev/lge/if_lge.c#7 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lnc.c#4 integrate .. //depot/projects/wifi/sys/dev/my/if_my.c#5 integrate .. //depot/projects/wifi/sys/dev/nge/if_nge.c#8 integrate .. //depot/projects/wifi/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#7 integrate .. //depot/projects/wifi/sys/dev/owi/if_owi.c#5 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm.c#4 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_intr.c#4 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_ioctl.c#4 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_tx.c#4 integrate .. //depot/projects/wifi/sys/dev/pdq/pdq_ifsubr.c#5 integrate .. //depot/projects/wifi/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/wifi/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#9 integrate .. //depot/projects/wifi/sys/dev/ray/if_rayvar.h#7 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#8 integrate .. //depot/projects/wifi/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/wifi/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/wifi/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/wifi/sys/dev/snc/dp83932.c#6 integrate .. //depot/projects/wifi/sys/dev/snc/if_snc_pccard.c#5 integrate .. //depot/projects/wifi/sys/dev/snp/snp.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/wifi/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/wifi/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/wifi/sys/dev/txp/if_txp.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/wifi/sys/dev/vge/if_vge.c#8 integrate .. //depot/projects/wifi/sys/dev/vkbd/vkbd.c#8 integrate .. //depot/projects/wifi/sys/dev/vx/if_vx.c#6 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/wifi/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/wifi/sys/dev/xe/if_xe_pccard.c#6 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/unionfs/union.h#4 integrate .. //depot/projects/wifi/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/wifi/sys/i386/isa/if_el.c#4 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_ipr.c#4 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_isppp.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_poll.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#12 integrate .. //depot/projects/wifi/sys/kern/tty_pty.c#7 integrate .. //depot/projects/wifi/sys/kern/tty_tty.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#30 integrate .. //depot/projects/wifi/sys/libkern/strcasecmp.c#2 integrate .. //depot/projects/wifi/sys/modules/twa/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/twe/Makefile#2 integrate .. //depot/projects/wifi/sys/net/bpf.c#13 integrate .. //depot/projects/wifi/sys/net/bridge.c#8 integrate .. //depot/projects/wifi/sys/net/bridgestp.c#3 integrate .. //depot/projects/wifi/sys/net/if.c#18 integrate .. //depot/projects/wifi/sys/net/if.h#6 integrate .. //depot/projects/wifi/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/wifi/sys/net/if_atm.h#4 integrate .. //depot/projects/wifi/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#5 integrate .. //depot/projects/wifi/sys/net/if_ef.c#4 integrate .. //depot/projects/wifi/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/wifi/sys/net/if_faith.c#5 integrate .. //depot/projects/wifi/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/wifi/sys/net/if_fwsubr.c#6 integrate .. //depot/projects/wifi/sys/net/if_gif.c#5 integrate .. //depot/projects/wifi/sys/net/if_gre.c#5 integrate .. //depot/projects/wifi/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/wifi/sys/net/if_loop.c#5 integrate .. //depot/projects/wifi/sys/net/if_ppp.c#5 integrate .. //depot/projects/wifi/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/wifi/sys/net/if_tap.c#10 integrate .. //depot/projects/wifi/sys/net/if_tun.c#8 integrate .. //depot/projects/wifi/sys/net/if_var.h#16 integrate .. //depot/projects/wifi/sys/net/if_vlan.c#7 integrate .. //depot/projects/wifi/sys/net/ppp_tty.c#6 integrate .. //depot/projects/wifi/sys/net/route.c#4 integrate .. //depot/projects/wifi/sys/net/rtsock.c#8 integrate .. //depot/projects/wifi/sys/net80211/_ieee80211.h#8 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#28 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#62 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#47 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#63 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#33 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#55 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#22 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#35 integrate .. //depot/projects/wifi/sys/netatm/atm_if.c#4 integrate .. //depot/projects/wifi/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#4 integrate .. //depot/projects/wifi/sys/netgraph/atm/ng_atm.c#5 integrate .. //depot/projects/wifi/sys/netgraph/atm/sscop/ng_sscop.c#3 integrate .. //depot/projects/wifi/sys/netgraph/atm/uni/ng_uni.c#3 integrate .. //depot/projects/wifi/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/wifi/sys/netgraph/ng_eiface.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/wifi/sys/netgraph/ng_fec.c#5 integrate .. //depot/projects/wifi/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/wifi/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_sppp.c#5 integrate .. //depot/projects/wifi/sys/netinet/if_ether.c#8 integrate .. //depot/projects/wifi/sys/netinet/in_proto.c#5 integrate .. //depot/projects/wifi/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/wifi/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#9 integrate .. //depot/projects/wifi/sys/netinet/pim_var.h#3 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/wifi/sys/netinet6/in6.c#6 integrate .. //depot/projects/wifi/sys/netinet6/in6.h#5 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/wifi/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/wifi/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/wifi/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/wifi/sys/netinet6/nd6.c#6 integrate .. //depot/projects/wifi/sys/netinet6/nd6_nbr.c#6 integrate .. //depot/projects/wifi/sys/netinet6/pim6_var.h#3 integrate .. //depot/projects/wifi/sys/netnatm/natm.c#5 integrate .. //depot/projects/wifi/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/wifi/sys/pci/if_dc.c#8 integrate .. //depot/projects/wifi/sys/pci/if_de.c#8 integrate .. //depot/projects/wifi/sys/pci/if_pcn.c#8 integrate .. //depot/projects/wifi/sys/pci/if_rl.c#7 integrate .. //depot/projects/wifi/sys/pci/if_sf.c#8 integrate .. //depot/projects/wifi/sys/pci/if_sis.c#8 integrate .. //depot/projects/wifi/sys/pci/if_sk.c#15 integrate .. //depot/projects/wifi/sys/pci/if_ste.c#6 integrate .. //depot/projects/wifi/sys/pci/if_ti.c#10 integrate .. //depot/projects/wifi/sys/pci/if_tl.c#6 integrate .. //depot/projects/wifi/sys/pci/if_vr.c#7 integrate .. //depot/projects/wifi/sys/pci/if_wb.c#6 integrate .. //depot/projects/wifi/sys/pci/if_xl.c#10 integrate .. //depot/projects/wifi/sys/sys/conf.h#11 integrate .. //depot/projects/wifi/sys/sys/interrupt.h#3 integrate .. //depot/projects/wifi/sys/sys/proc.h#17 integrate .. //depot/projects/wifi/sys/sys/protosw.h#3 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#12 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#19 integrate .. //depot/projects/wifi/tools/tools/build_option_survey/collect_all_make_options.sh#1 branch .. //depot/projects/wifi/tools/tools/build_option_survey/mkhtml.sh#2 integrate .. //depot/projects/wifi/tools/tools/build_option_survey/no_list#2 delete .. //depot/projects/wifi/tools/tools/build_option_survey/option_survey.sh#2 integrate .. //depot/projects/wifi/tools/tools/build_option_survey/reduce.sh#1 branch .. //depot/projects/wifi/usr.sbin/Makefile#15 integrate .. //depot/projects/wifi/usr.sbin/config/config.8#4 integrate .. //depot/projects/wifi/usr.sbin/config/main.c#6 integrate .. //depot/projects/wifi/usr.sbin/portsnap/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/Makefile.inc#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/make_index/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/make_index/make_index.c#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/phttpget/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/phttpget/phttpget.c#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/portsnap/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/portsnap/portsnap.8#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/portsnap/portsnap.sh#1 branch .. //depot/projects/wifi/usr.sbin/rtadvd/rtadvd.conf.5#3 integrate Differences ... ==== //depot/projects/wifi/MAINTAINERS#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.123 2005/08/06 06:46:29 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.124 2005/08/08 20:10:04 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -128,6 +128,7 @@ pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. +portsnap cperciva Pre-commit review requested. 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/wifi/etc/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.345 2005/07/22 10:35:35 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.346 2005/08/08 20:10:05 cperciva Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -11,7 +11,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ - pf.conf pf.os phones profile protocols \ + portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ ==== //depot/projects/wifi/etc/mtree/BSD.var.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.71 2004/10/15 08:57:24 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.72 2005/08/08 20:10:05 cperciva Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -34,6 +34,8 @@ .. ports .. + portsnap + .. .. empty mode=0555 flags=schg .. ==== //depot/projects/wifi/games/fortune/datfiles/fortunes#14 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.179 2005/06/10 08:58:44 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.182 2005/08/10 17:18:06 schweikh Exp $ % ======================================================================= @@ -17432,7 +17432,7 @@ % Everlasting peace will come to the world when the last man has slain the last but one. - -- Adolph Hitler + -- Adolf Hitler % Every absurdity has a champion who will defend it. % @@ -25066,7 +25066,7 @@ it is plausible or not. The victor will not be asked afterwards whether he told the truth or not. When starting and waging war it is not right that matters, but victory. - -- Adolph Hitler + -- Adolf Hitler % I shot an arrow in to the air, and it stuck. -- graffito in Los Angeles @@ -44336,7 +44336,7 @@ Success is something I will dress for when I get there, and not until. % Success is the sole earthly judge of right and wrong. - -- Adolph Hitler, "Mein Kampf" + -- Adolf Hitler, "Mein Kampf" % Succumb to natural tendencies. Be hateful and boring. % @@ -49970,7 +49970,7 @@ % The very first essential for success is a perpetually constant and regular employment of violence. - -- Adolph Hitler, "Mein Kampf" + -- Adolf Hitler, "Mein Kampf" % The very ink with which all history is written is merely fluid prejudice. @@ -55975,7 +55975,7 @@ -- Jack Kerouac % What luck for the rulers that men do not think. - -- Adolph Hitler + -- Adolf Hitler % What makes the Universe so hard to comprehend is that there's nothing to compare it with. ==== //depot/projects/wifi/games/fortune/datfiles/fortunes2-o#3 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.30 2005/02/03 22:48:29 schweikh Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.32 2005/08/10 17:18:07 schweikh Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 ==== //depot/projects/wifi/lib/libarchive/archive_platform.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.16 2005/06/04 22:30:36 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.17 2005/08/10 15:01:03 kientzle Exp $ */ /* @@ -49,6 +49,7 @@ #define HAVE_ACL_SET_FD 1 #define HAVE_ACL_SET_FD_NP 1 #define HAVE_ACL_SET_FILE 1 +#define HAVE_ACL_USER 1 #endif #define HAVE_BZLIB_H 1 #define HAVE_CHFLAGS 1 @@ -122,11 +123,11 @@ #endif /* - * If this platform has , acl_create(), acl_init(), and - * acl_set_file(), we assume it has the rest of the POSIX.1e draft - * functions used in archive_read_extract.c. + * If this platform has , acl_create(), acl_init(), + * acl_set_file(), and ACL_USER, we assume it has the rest of the + * POSIX.1e draft functions used in archive_read_extract.c. */ -#if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE +#if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE && HAVE_ACL_USER #define HAVE_POSIX_ACL 1 #endif ==== //depot/projects/wifi/lib/libarchive/archive_read_data_into_fd.c#3 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.8 2005/06/01 15:52:39 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.9 2005/08/10 15:02:53 kientzle Exp $"); #include +#include #include #include "archive.h" @@ -65,8 +66,10 @@ if (bytes_to_write > MAX_WRITE) bytes_to_write = MAX_WRITE; bytes_written = write(fd, buff, bytes_to_write); - if (bytes_written < 0) + if (bytes_written < 0) { + archive_set_error(a, errno, "Write error"); return (-1); + } output_offset += bytes_written; total_written += bytes_written; size -= bytes_written; ==== //depot/projects/wifi/lib/libarchive/configure.ac.in#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.6 2005/06/04 22:30:36 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.7 2005/08/10 15:01:03 kientzle Exp $ #Process this file with autoconf to produce a configure script. AC_INIT(libarchive, @VERSION@, kientzle@freebsd.org) @@ -77,6 +77,14 @@ AC_CHECK_FUNCS([lchflags lchmod lchown lutimes memmove]) AC_CHECK_FUNCS([memset mkdir mkfifo strchr strdup strerror strrchr]) +# MacOS has an acl.h that isn't POSIX. It can be detected by +# checking for ACL_USER +AC_CHECK_DECL([ACL_USER], + [AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])], + [], + [#include ]) + + # Additional requirements AC_SYS_LARGEFILE AC_SUBST(ARCHIVE_API_VERSION,[1]) ==== //depot/projects/wifi/lib/libdevstat/devstat.3#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.27 2005/07/17 13:33:04 charnier Exp $ +.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.28 2005/08/10 00:51:36 ken Exp $ .\" .Dd March 18, 2003 .Dt DEVSTAT 3 @@ -442,10 +442,7 @@ .Pp The .Fn devstat_compute_statistics -function -is an updated version of -.Fn compute_stats -that provides more complete statistics calculation. +function provides complete statistics calculation. There are four arguments for which values .Em must be supplied: ==== //depot/projects/wifi/lib/libedit/chared.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: chared.c,v 1.24 2005/08/01 23:00:15 christos Exp $ + * $NetBSD: chared.c,v 1.25 2005/08/08 01:41:30 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/chared.c,v 1.9 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/chared.c,v 1.10 2005/08/09 13:31:59 stefanf Exp $"); /* * chared.c: Character editor utilities @@ -522,6 +522,8 @@ el->el_state.argument = 1; el->el_state.lastcmd = ED_UNASSIGNED; + el->el_history.eventno = 0; + if (mclear) ch__clearmacro(el); } ==== //depot/projects/wifi/lib/libedit/chared.h#3 (text+ko) ==== @@ -30,8 +30,8 @@ * SUCH DAMAGE. * * @(#)chared.h 8.1 (Berkeley) 6/4/93 - * $NetBSD: chared.h,v 1.15 2005/08/01 23:00:15 christos Exp $ - * $FreeBSD: src/lib/libedit/chared.h,v 1.7 2005/08/07 20:51:52 stefanf Exp $ + * $NetBSD: chared.h,v 1.16 2005/08/08 14:05:37 christos Exp $ + * $FreeBSD: src/lib/libedit/chared.h,v 1.8 2005/08/09 13:37:59 stefanf Exp $ */ /* ==== //depot/projects/wifi/lib/libedit/common.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: common.c,v 1.17 2005/08/01 23:00:15 christos Exp $ + * $NetBSD: common.c,v 1.18 2005/08/08 14:05:37 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/common.c,v 1.10 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/common.c,v 1.11 2005/08/09 13:37:59 stefanf Exp $"); /* * common.c: Common Editor functions ==== //depot/projects/wifi/lib/libedit/editline.3#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libedit/editline.3,v 1.24 2005/08/07 20:51:52 stefanf Exp $ +.\" $FreeBSD: src/lib/libedit/editline.3,v 1.25 2005/08/09 13:35:48 stefanf Exp $ .\" .Dd July 14, 2005 .Os @@ -648,7 +648,7 @@ .Pp The .Fn history -function returns 0 if the operation +function returns \*[Gt]= 0 if the operation .Fa op succeeds. Otherwise, \-1 is returned and ==== //depot/projects/wifi/lib/libedit/emacs.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: emacs.c,v 1.19 2004/10/28 21:14:52 dsl Exp $ + * $NetBSD: emacs.c,v 1.20 2005/08/08 14:05:37 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/emacs.c,v 1.9 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/emacs.c,v 1.10 2005/08/09 13:37:59 stefanf Exp $"); /* * emacs.c: Emacs functions ==== //depot/projects/wifi/lib/libedit/key.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: key.c,v 1.16 2005/07/06 21:13:02 christos Exp $ + * $NetBSD: key.c,v 1.17 2005/08/08 14:05:37 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/key.c,v 1.10 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/key.c,v 1.11 2005/08/09 13:37:59 stefanf Exp $"); /* * key.c: This module contains the procedures for maintaining ==== //depot/projects/wifi/lib/libedit/sys.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)sys.h 8.1 (Berkeley) 6/4/93 * $NetBSD: sys.h,v 1.9 2004/01/17 17:57:40 christos Exp $ - * $FreeBSD: src/lib/libedit/sys.h,v 1.5 2005/08/07 20:51:52 stefanf Exp $ + * $FreeBSD: src/lib/libedit/sys.h,v 1.6 2005/08/10 13:41:31 stefanf Exp $ */ /* @@ -40,6 +40,8 @@ #ifndef _h_sys #define _h_sys +#include + #ifndef public # define public /* Externally visible functions/variables */ #endif @@ -53,8 +55,6 @@ /* When we want to hide everything */ #endif -#include - #ifndef _PTR_T # define _PTR_T typedef void *ptr_t; ==== //depot/projects/wifi/lib/libedit/term.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: term.c,v 1.40 2004/05/22 23:21:28 christos Exp $ + * $NetBSD: term.c,v 1.41 2005/08/08 14:05:37 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/term.c,v 1.18 2005/08/08 07:08:35 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/term.c,v 1.19 2005/08/09 13:37:59 stefanf Exp $"); /* * term.c: Editor/termcap-curses interface ==== //depot/projects/wifi/lib/libedit/vi.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: vi.c,v 1.21 2005/04/25 01:06:03 matt Exp $ + * $NetBSD: vi.c,v 1.24 2005/08/10 12:46:24 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/vi.c,v 1.11 2005/08/08 07:08:35 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/vi.c,v 1.13 2005/08/10 13:38:01 stefanf Exp $"); /* * vi.c: Vi mode commands. @@ -66,8 +66,10 @@ el->el_line.lastchar - el->el_line.buffer); el->el_chared.c_vcmd.action = NOP; el->el_chared.c_vcmd.pos = 0; - el->el_line.lastchar = el->el_line.buffer; - el->el_line.cursor = el->el_line.buffer; + if (!(c & YANK)) { + el->el_line.lastchar = el->el_line.buffer; + el->el_line.cursor = el->el_line.buffer; + } if (c & INSERT) el->el_map.current = el->el_map.key; @@ -84,7 +86,6 @@ private el_action_t cv_paste(EditLine *el, int c) { - char *ptr; c_kill_t *k = &el->el_chared.c_kill; int len = k->last - k->buf; @@ -98,12 +99,12 @@ if (!c && el->el_line.cursor < el->el_line.lastchar) el->el_line.cursor++; - ptr = el->el_line.cursor; c_insert(el, len); if (el->el_line.cursor + len > el->el_line.lastchar) return (CC_ERROR); - (void) memcpy(ptr, k->buf, len +0u); + (void) memcpy(el->el_line.cursor, k->buf, len +0u); + return (CC_REFRESH); } ==== //depot/projects/wifi/lib/libmemstat/libmemstat.3#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libmemstat/libmemstat.3,v 1.8 2005/08/06 13:54:03 rwatson Exp $ +.\" $FreeBSD: src/lib/libmemstat/libmemstat.3,v 1.9 2005/08/09 22:19:30 rwatson Exp $ .\" .Dd June 27, 2005 .Os @@ -375,7 +375,7 @@ .Fn memstat_strerror . Possible error values are: .Pp -.Bl -tag -width "MEMSTAT_ERROR_TOOMANYCPUS" -compact -offset wee +.Bl -tag -width "MEMSTAT_ERROR_KVM_SHORTREAD" -compact -offset wee .It Dv MEMSTAT_ERROR_UNDEFINED Undefined error. Occurs if .Fn memstat_mtl_geterror @@ -407,6 +407,24 @@ .Nm is unable to interpret statistics data returned by the data source, even though there does not appear to be a version problem. +.It Dv MEMSTAT_ERROR_KVM +Returned if +.Nm +experiences an error while using +.Xr kvm 3 +interfaces to query statistics data. +Use +.Xr kvm_geterr 3 +to retrieve the error. +.It Dv MEMSTAT_ERROR_KVM_NOSYMBOL +Returned if +.Nm +is unable to read a required symbol from the kernel being operated on. +.It Dv MEMSTAT_ERROR_KVM_SHORTREAD +Returned if +.Nm +attempts to read data from a live memory image or kernel core dump and +insufficient data is returned. .El .Pp Finally, functions returning data from a @@ -453,7 +471,7 @@ .Sh BUGS There are memory allocators in the kernel, such as the VM page allocator and sf_buf allocator, which are not currently supported by -.Nm. +.Nm .Pp Once a memory type is present on a memory type list, it will not be removed even if the kernel no longer presents information on the type via its ==== //depot/projects/wifi/share/man/man4/nge.4#5 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/nge.4,v 1.17 2005/07/21 05:02:38 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/nge.4,v 1.18 2005/08/09 13:25:34 brueffer Exp $ .\" .Dd July 16, 2005 .Dt NGE 4 @@ -164,23 +164,23 @@ .Pp .Bl -bullet -compact .It -SMC EZ Card 1000 (SMC9462TX) +Addtron AEG320T .It -D-Link DGE-500T +Ark PC SOHO-GA2500T (32-bit PCI) and SOHO-GA2000T (64-bit PCI) .It Asante FriendlyNet GigaNIX 1000TA and 1000TPC .It -Addtron AEG320T +D-Link DGE-500T .It LinkSys EG1032 (32-bit PCI) and EG1064 (64-bit PCI) .It -Surecom Technology EP-320G-TX +Netgear GA621 .It Netgear GA622T .It -Netgear GA621 +SMC EZ Card 1000 (SMC9462TX) .It -Ark PC SOHO-GA2500T (32-bit PCI) and SOHO-GA2000T (64-bit PCI) +Surecom Technology EP-320G-TX .It Trendware TEG-PCITX (32-bit PCI) and TEG-PCITX2 (64-bit PCI) .El ==== //depot/projects/wifi/share/man/man4/nve.4#5 (text+ko) ==== @@ -24,9 +24,9 @@ .\" .\" $Id: nvnet.4,v 1.1 2003/10/09 16:48:01 q Exp $ .\" -.\" $FreeBSD: src/share/man/man4/nve.4,v 1.4 2005/07/21 05:02:38 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/nve.4,v 1.5 2005/08/09 13:32:45 brueffer Exp $ .\" -.Dd July 16, 2005 +.Dd August 9, 2005 .Dt NVE 4 .Os .Sh NAME @@ -97,6 +97,10 @@ nForce .It nForce2 +.It +nForce3 +.It +nForce4 .El .Sh DIAGNOSTICS .Bl -diag ==== //depot/projects/wifi/share/man/man4/pcvt.4#4 (text+ko) ==== @@ -32,7 +32,7 @@ .\" .\" Last Edit-Date: [Sun Mar 26 14:39:08 2000] .\" -.\" $FreeBSD: src/share/man/man4/pcvt.4,v 1.45 2005/02/13 23:45:49 ru Exp $ +.\" $FreeBSD: src/share/man/man4/pcvt.4,v 1.46 2005/08/09 14:11:57 murray Exp $ .\" .\" Man page pcvt(4) created after pcvt_ioctl.h on 13-Jan-93 .\" by Joerg Wunsch @@ -142,11 +142,11 @@ operating system. It has been designed to be highly configurable in order to satisfy everyone's needs. -The preferred way for those configurations is to +The preferred configuration method is to provide appropriate -.Em options -lines within the config file, possibly overriding the built-in default -values. +.Em option +lines within the kernel configuration file, +possibly overriding the built-in defaults. .Pp The following list gives a short overview of the available configuration options. @@ -154,13 +154,9 @@ .Pa i386/isa/pcvt/pcvt_conf.h in the kernel source tree for detailed documentation. .Pp -Note: the following conventions apply to all the Boolean options. -If an option is given with no value, a value of 1 -(activated) -is substituted. -If an option value is given as 0, this options is -deactivated. -Any other value is substituted by 1, too. +Note: The following conventions apply to all Boolean options. +If an option value is given as 0, the option is deactivated. +With any other value, or no value, the option is activated. If an option is omitted, a built-in default is assumed. .Bl -tag -width indent @@ -648,7 +644,7 @@ .Pp Depending on the configuration of a .Nm -driver, their might be a simple screen saver available. +driver, there might be a simple screen saver available. It is controlled by the command .Pp @@ -658,7 +654,7 @@ .El .Pp taking a pointer to an integer as argument. -Despite of its command name, +Despite its command name, this is available on .Em any kind of adaptor if configured in by the ==== //depot/projects/wifi/share/man/man5/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/man/man5/Makefile,v 1.59 2005/08/06 06:57:25 phk Exp $ +# $FreeBSD: src/share/man/man5/Makefile,v 1.60 2005/08/08 20:10:05 cperciva Exp $ #MISSING: dump.5 plot.5 MAN= acct.5 \ @@ -40,6 +40,7 @@ nsswitch.conf.5 \ passwd.5 \ pbm.5 \ + portsnap.conf.5 \ periodic.conf.5 \ phones.5 \ procfs.5 \ ==== //depot/projects/wifi/share/man/man9/bios.9#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man9/bios.9,v 1.14 2005/07/21 09:48:36 phk Exp $ +.\" $FreeBSD: src/share/man/man9/bios.9,v 1.15 2005/08/09 13:55:21 murray Exp $ .\" .\" Copyright (c) 1997 Michael Smith .\" All rights reserved. @@ -127,7 +127,7 @@ Returns the effective physical address which corresponds to the kernel virtual address .Fa addr . -.It Fn BIOS_VADDRTOPADDR +.It Fn BIOS_PADDRTOVADDR Returns the kernel virtual address which corresponds to the effective physical address .Fa addr . ==== //depot/projects/wifi/share/man/man9/bus_alloc_resource.9#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bus_alloc_resource.9,v 1.21 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/bus_alloc_resource.9,v 1.22 2005/08/09 11:55:18 brian Exp $ .\" .Dd May 18, 2000 .Dt BUS_ALLOC_RESOURCE 9 @@ -159,7 +159,7 @@ .Va irqid should be saved in the softc of the device after these calls. .Bd -literal - struct resource *portres, irqres; + struct resource *portres, *irqres; int portid, irqid; portid = 0; ==== //depot/projects/wifi/share/man/man9/device_add_child.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/device_add_child.9,v 1.19 2004/07/03 18:29:23 ru Exp $ +.\" $FreeBSD: src/share/man/man9/device_add_child.9,v 1.21 2005/08/09 11:14:21 brian Exp $ .\" .Dd May 13, 2004 .Dt DEVICE_ADD_CHILD 9 @@ -67,8 +67,8 @@ as PCI) to allow each driver to check each device instance for a match. For busses which rely on supplied probe hints where only one -driver can have a change of probing the device, the driver name should -specified as the device name. +driver can have a chance of probing the device, the driver name should +be specified as the device name. .Pp Normally unit numbers will be chosen automatically by the system and a unit number of @@ -96,8 +96,10 @@ .Pp When adding a device in the context of .Xr DEVICE_IDENTIFY 9 -routine, some care must be taken to ensure that the device has not -already been added to the tree. +routine, the +.Xr device_find_children 9 +routine should be used to ensure that the device has not already been +added to the tree. Because the device name and .Vt devclass_t are associated at probe time (not child addition time), previous @@ -109,7 +111,9 @@ .Sh RETURN VALUES The new device if successful, NULL otherwise. .Sh SEE ALSO +.Xr DEVICE_IDENTIFY 9 .Xr device 9 +.Xr device_find_children 9 >>> TRUNCATED FOR MAIL (1000 lines) <<<