Date: Sun, 25 Jan 2004 18:11:28 -0800 (PST) From: Juli Mallett <jmallett@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 45900 for review Message-ID: <200401260211.i0Q2BSNq048384@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=45900 Change 45900 by jmallett@jmallett_oingo on 2004/01/25 18:11:18 IFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#20 integrate .. //depot/projects/mips/bin/ls/print.c#9 integrate .. //depot/projects/mips/bin/ps/ps.1#6 integrate .. //depot/projects/mips/bin/sh/Makefile#3 integrate .. //depot/projects/mips/bin/sh/eval.c#4 integrate .. //depot/projects/mips/bin/sh/input.c#3 integrate .. //depot/projects/mips/bin/sh/parser.c#4 integrate .. //depot/projects/mips/bin/sh/redir.c#3 integrate .. //depot/projects/mips/bin/sh/redir.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/mips/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/mips/contrib/bsnmp/README#2 integrate .. //depot/projects/mips/contrib/bsnmp/TODO#2 integrate .. //depot/projects/mips/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/mips/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/mips/contrib/cvs/src/server.c#4 integrate .. //depot/projects/mips/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/mips/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/mips/contrib/gdtoa/xsum0.out#4 integrate .. //depot/projects/mips/contrib/isc-dhcp/FREEBSD-upgrade#4 integrate .. //depot/projects/mips/contrib/isc-dhcp/client/dhclient.c#5 integrate .. //depot/projects/mips/contrib/isc-dhcp/common/convert.c#2 delete .. //depot/projects/mips/contrib/isc-dhcp/common/errwarn.c#2 delete .. //depot/projects/mips/contrib/isc-dhcp/common/hash.c#2 delete .. //depot/projects/mips/contrib/isc-dhcp/common/inet_addr.c#2 delete .. //depot/projects/mips/contrib/isc-dhcp/includes/hash.h#2 delete .. //depot/projects/mips/contrib/isc-dhcp/includes/sysconf.h#2 delete .. //depot/projects/mips/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/mips/crypto/openssh/FREEBSD-upgrade#5 integrate .. //depot/projects/mips/etc/Makefile#13 integrate .. //depot/projects/mips/etc/defaults/devfs.rules#2 integrate .. //depot/projects/mips/etc/isdn/Makefile#3 integrate .. //depot/projects/mips/etc/mtree/BSD.usr.dist#11 integrate .. //depot/projects/mips/etc/mtree/BSD.var.dist#5 integrate .. //depot/projects/mips/etc/pccard_ether#5 integrate .. //depot/projects/mips/etc/rc.d/ipfilter#10 integrate .. //depot/projects/mips/etc/rc.subr#8 integrate .. //depot/projects/mips/etc/rc.suspend#3 integrate .. //depot/projects/mips/etc/sendmail/Makefile#3 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes2#8 integrate .. //depot/projects/mips/lib/csu/i386-elf/Makefile#4 integrate .. //depot/projects/mips/lib/libbsnmp/Makefile#2 integrate .. //depot/projects/mips/lib/libbsnmp/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libbsnmp/libbsnmp/Makefile#3 integrate .. //depot/projects/mips/lib/libbsnmp/modules/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/Makefile#2 integrate .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/genfiles#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/genfiles#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h#2 delete .. //depot/projects/mips/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 integrate .. //depot/projects/mips/lib/libc/Makefile#9 integrate .. //depot/projects/mips/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/mips/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/mips/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/mips/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/mips/lib/libc/sparc64/sys/__sparc_utrap.c#3 integrate .. //depot/projects/mips/lib/libc/stdio/printf.3#5 integrate .. //depot/projects/mips/lib/libc/stdio/vfwprintf.c#10 integrate .. //depot/projects/mips/lib/libc/stdlib/random.c#4 integrate .. //depot/projects/mips/lib/libc/sys/gettimeofday.2#5 integrate .. //depot/projects/mips/lib/libc/sys/read.2#4 integrate .. //depot/projects/mips/lib/libc/xdr/xdr_stdio.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/pthread_private.h#8 integrate .. //depot/projects/mips/lib/libfetch/fetch.3#8 integrate .. //depot/projects/mips/lib/libsdp/Makefile#2 integrate .. //depot/projects/mips/lib/libsdp/sdp.3#3 integrate .. //depot/projects/mips/lib/libsdp/sdp.h#3 integrate .. //depot/projects/mips/lib/libsdp/search.c#3 integrate .. //depot/projects/mips/lib/libsdp/service.c#1 branch .. //depot/projects/mips/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/mips/lib/libstand/dosfs.c#2 integrate .. //depot/projects/mips/lib/libstand/ext2fs.c#2 integrate .. //depot/projects/mips/lib/libstand/fstat.c#2 integrate .. //depot/projects/mips/lib/libstand/gzipfs.c#3 integrate .. //depot/projects/mips/lib/libstand/nfs.c#3 integrate .. //depot/projects/mips/lib/libstand/nullfs.c#2 integrate .. //depot/projects/mips/lib/libstand/read.c#2 integrate .. //depot/projects/mips/lib/libstand/splitfs.c#3 integrate .. //depot/projects/mips/lib/libstand/ufs.c#3 integrate .. //depot/projects/mips/lib/libthr/thread/thr_exit.c#4 integrate .. //depot/projects/mips/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/mips/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/mips/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/mips/lib/libthr/thread/thr_spinlock.c#5 integrate .. //depot/projects/mips/release/Makefile#23 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#15 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#16 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate .. //depot/projects/mips/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/mips/sbin/atm/fore_dnld/fore_dnld.c#3 integrate .. //depot/projects/mips/sbin/camcontrol/modeedit.c#6 integrate .. //depot/projects/mips/sbin/devfs/devfs.c#2 integrate .. //depot/projects/mips/sbin/devfs/rule.c#2 integrate .. //depot/projects/mips/sbin/ffsinfo/ffsinfo.8#3 integrate .. //depot/projects/mips/sbin/growfs/growfs.8#7 integrate .. //depot/projects/mips/sbin/ipfw/ipfw.8#12 integrate .. //depot/projects/mips/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/mips/sbin/mdmfs/mdmfs.c#5 integrate .. //depot/projects/mips/sbin/quotacheck/quotacheck.c#5 integrate .. //depot/projects/mips/sbin/sconfig/Makefile#2 integrate .. //depot/projects/mips/sbin/sconfig/sconfig.8#2 integrate .. //depot/projects/mips/share/Makefile#4 integrate .. //depot/projects/mips/share/doc/papers/Makefile#3 integrate .. //depot/projects/mips/share/doc/psd/Makefile#2 integrate .. //depot/projects/mips/share/doc/smm/Makefile#2 integrate .. //depot/projects/mips/share/doc/usd/Makefile#3 integrate .. //depot/projects/mips/share/examples/cvsup/cvs-supfile#6 integrate .. //depot/projects/mips/share/examples/cvsup/ports-supfile#5 integrate .. //depot/projects/mips/share/man/man1/Makefile#2 integrate .. //depot/projects/mips/share/man/man3/Makefile#4 integrate .. //depot/projects/mips/share/man/man3/pthread_spin_init.3#1 branch .. //depot/projects/mips/share/man/man3/pthread_spin_lock.3#1 branch .. //depot/projects/mips/share/man/man4/Makefile#21 integrate .. //depot/projects/mips/share/man/man4/ata.4#6 integrate .. //depot/projects/mips/share/man/man4/gdb.4#3 integrate .. //depot/projects/mips/share/man/man4/man4.i386/Makefile#10 integrate .. //depot/projects/mips/share/man/man4/ng_one2many.4#3 integrate .. //depot/projects/mips/share/man/man4/random.4#3 integrate .. //depot/projects/mips/share/man/man4/tdfx.4#2 integrate .. //depot/projects/mips/share/man/man4/uplcom.4#3 integrate .. //depot/projects/mips/share/man/man4/witness.4#2 integrate .. //depot/projects/mips/share/man/man5/Makefile#6 integrate .. //depot/projects/mips/share/man/man6/intro.6#2 integrate .. //depot/projects/mips/share/man/man7/Makefile#5 integrate .. //depot/projects/mips/share/man/man8/Makefile#6 integrate .. //depot/projects/mips/share/man/man8/yp.8#3 integrate .. //depot/projects/mips/share/man/man9/MUTEX_PROFILING.9#1 branch .. //depot/projects/mips/share/man/man9/Makefile#14 integrate .. //depot/projects/mips/share/man/man9/ifnet.9#6 integrate .. //depot/projects/mips/share/man/man9/mac.9#5 integrate .. //depot/projects/mips/share/man/man9/mbuf.9#10 integrate .. //depot/projects/mips/share/man/man9/mutex.9#7 integrate .. //depot/projects/mips/share/man/man9/sbuf.9#4 integrate .. //depot/projects/mips/share/man/man9/zone.9#5 integrate .. //depot/projects/mips/share/skel/Makefile#2 integrate .. //depot/projects/mips/share/syscons/fonts/Makefile#4 integrate .. //depot/projects/mips/share/syscons/keymaps/Makefile#6 integrate .. //depot/projects/mips/share/syscons/keymaps/it.iso.kbd#3 integrate .. //depot/projects/mips/share/syscons/scrnmaps/Makefile#3 integrate .. //depot/projects/mips/share/termcap/termcap.src#5 integrate .. //depot/projects/mips/sys/alpha/alpha/support.s#4 integrate .. //depot/projects/mips/sys/alpha/conf/GENERIC#13 integrate .. //depot/projects/mips/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/mips/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/mips/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/mips/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/mips/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/mips/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/mips/sys/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/mips/sys/conf/NOTES#21 integrate .. //depot/projects/mips/sys/conf/files.i386#17 integrate .. //depot/projects/mips/sys/conf/files.pc98#17 integrate .. //depot/projects/mips/sys/conf/files.powerpc#8 integrate .. //depot/projects/mips/sys/conf/kern.post.mk#13 integrate .. //depot/projects/mips/sys/conf/kern.pre.mk#9 integrate .. //depot/projects/mips/sys/conf/options.i386#15 integrate .. //depot/projects/mips/sys/conf/options.powerpc#7 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pci_link.c#8 integrate .. //depot/projects/mips/sys/dev/amd/amd.c#5 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.c#17 integrate .. //depot/projects/mips/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/mips/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/mips/sys/dev/ata/ata-disk.c#15 integrate .. //depot/projects/mips/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/mips/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/mips/sys/dev/ata/atapi-cd.c#12 integrate .. //depot/projects/mips/sys/dev/fb/fbreg.h#6 integrate .. //depot/projects/mips/sys/dev/firewire/fwdev.c#9 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci.c#19 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci_pci.c#15 integrate .. //depot/projects/mips/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/mips/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/mips/sys/dev/isp/isp.c#6 integrate .. //depot/projects/mips/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/mips/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/mips/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc_pci.c#5 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs#12 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs.h#12 integrate .. //depot/projects/mips/sys/dev/sound/pcm/ac97.c#13 integrate .. //depot/projects/mips/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/mips/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/mips/sys/dev/sound/pcm/sound.c#9 integrate .. //depot/projects/mips/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/mips/sys/dev/sound/pcm/vchan.c#8 integrate .. //depot/projects/mips/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/mips/sys/dev/syscons/schistory.c#5 integrate .. //depot/projects/mips/sys/dev/syscons/scterm-dumb.c#3 integrate .. //depot/projects/mips/sys/dev/syscons/scterm-sc.c#3 integrate .. //depot/projects/mips/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/mips/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/mips/sys/dev/usb/umass.c#15 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs.h#16 integrate .. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#16 integrate .. //depot/projects/mips/sys/fs/devfs/devfs_rule.c#7 integrate .. //depot/projects/mips/sys/geom/bde/g_bde_crypt.c#10 integrate .. //depot/projects/mips/sys/geom/geom_dev.c#16 integrate .. //depot/projects/mips/sys/geom/geom_disk.c#17 integrate .. //depot/projects/mips/sys/geom/geom_event.c#12 integrate .. //depot/projects/mips/sys/geom/geom_subr.c#18 integrate .. //depot/projects/mips/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/mips/sys/gnu/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/mips/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/mips/sys/i386/conf/NOTES#18 integrate .. //depot/projects/mips/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/mips/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/mips/sys/i386/i386/longrun.c#1 branch .. //depot/projects/mips/sys/i386/i386/mp_machdep.c#14 integrate .. //depot/projects/mips/sys/i386/i386/p4tcc.c#2 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/mips/sys/i386/i386/swtch.s#6 integrate .. //depot/projects/mips/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/mips/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/mips/sys/ia64/ia64/trap.c#13 integrate .. //depot/projects/mips/sys/isofs/cd9660/cd9660_vnops.c#8 integrate .. //depot/projects/mips/sys/kern/kern_condvar.c#13 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#18 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#20 integrate .. //depot/projects/mips/sys/kern/kern_idle.c#6 integrate .. //depot/projects/mips/sys/kern/kern_intr.c#13 integrate .. //depot/projects/mips/sys/kern/kern_jail.c#8 integrate .. //depot/projects/mips/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/mips/sys/kern/kern_mutex.c#12 integrate .. //depot/projects/mips/sys/kern/kern_ntptime.c#5 integrate .. //depot/projects/mips/sys/kern/kern_poll.c#5 integrate .. //depot/projects/mips/sys/kern/kern_prot.c#9 integrate .. //depot/projects/mips/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#17 integrate .. //depot/projects/mips/sys/kern/kern_subr.c#11 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#16 integrate .. //depot/projects/mips/sys/kern/kern_tc.c#10 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#21 integrate .. //depot/projects/mips/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/mips/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/mips/sys/kern/sched_ule.c#12 integrate .. //depot/projects/mips/sys/kern/subr_smp.c#8 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#15 integrate .. //depot/projects/mips/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/mips/sys/kern/subr_witness.c#18 integrate .. //depot/projects/mips/sys/kern/sys_generic.c#7 integrate .. //depot/projects/mips/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/mips/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/mips/sys/modules/firewire/Makefile#4 integrate .. //depot/projects/mips/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/mips/sys/modules/ncp/Makefile#2 integrate .. //depot/projects/mips/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/mips/sys/modules/nwfs/Makefile#3 integrate .. //depot/projects/mips/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/mips/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/mips/sys/net/if.c#10 integrate .. //depot/projects/mips/sys/net/if_media.h#5 integrate .. //depot/projects/mips/sys/net/if_ppp.c#10 integrate .. //depot/projects/mips/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/mips/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/mips/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/mips/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/mips/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/mips/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/mips/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/mips/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/mips/sys/netipsec/ipsec_output.c#6 integrate .. //depot/projects/mips/sys/netipsec/xform_ipip.c#6 integrate .. //depot/projects/mips/sys/netkey/key.c#8 integrate .. //depot/projects/mips/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/mips/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/mips/sys/pc98/pc98/sio.c#13 integrate .. //depot/projects/mips/sys/pci/if_rl.c#14 integrate .. //depot/projects/mips/sys/pci/if_sk.c#9 integrate .. //depot/projects/mips/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/mips/sys/powerpc/include/float.h#3 integrate .. //depot/projects/mips/sys/powerpc/include/sc_machdep.h#1 branch .. //depot/projects/mips/sys/powerpc/ofw/ofw_syscons.c#1 branch .. //depot/projects/mips/sys/powerpc/ofw/ofw_syscons.h#1 branch .. //depot/projects/mips/sys/powerpc/powerpc/clock.c#6 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#15 integrate .. //depot/projects/mips/sys/powerpc/powerpc/sc_machdep.c#1 branch .. //depot/projects/mips/sys/powerpc/powerpc/trap_subr.S#3 integrate .. //depot/projects/mips/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/mips/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/mips/sys/sys/_mutex.h#4 integrate .. //depot/projects/mips/sys/sys/_task.h#1 branch .. //depot/projects/mips/sys/sys/jail.h#3 integrate .. //depot/projects/mips/sys/sys/proc.h#22 integrate .. //depot/projects/mips/sys/sys/systm.h#10 integrate .. //depot/projects/mips/sys/sys/taskqueue.h#4 integrate .. //depot/projects/mips/sys/sys/user.h#9 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/mips/sys/vm/swap_pager.c#10 integrate .. //depot/projects/mips/sys/vm/vm_zeroidle.c#5 integrate .. //depot/projects/mips/tools/regression/lib/libc/stdio/test-printfloat.c#3 integrate .. //depot/projects/mips/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/mips/tools/tools/crypto/Makefile#6 integrate .. //depot/projects/mips/tools/tools/crypto/cryptotest.c#4 delete .. //depot/projects/mips/tools/tools/tinderbox/etc/Makefile#3 integrate .. //depot/projects/mips/tools/tools/tinderbox/etc/current.rc#2 integrate .. //depot/projects/mips/tools/tools/tinderbox/etc/experimental.rc#3 delete .. //depot/projects/mips/tools/tools/tinderbox/etc/releng_5.rc#3 integrate .. //depot/projects/mips/tools/tools/tinderbox/etc/stanley.rc#2 delete .. //depot/projects/mips/tools/tools/tinderbox/tbmaster.1#3 integrate .. //depot/projects/mips/tools/tools/tinderbox/tbmaster.pl#8 integrate .. //depot/projects/mips/tools/tools/tinderbox/tinderbox.1#4 integrate .. //depot/projects/mips/tools/tools/tinderbox/tinderbox.pl#8 integrate .. //depot/projects/mips/tools/tools/tinderbox/www/Makefile#4 integrate .. //depot/projects/mips/tools/tools/tinderbox/www/index.cgi#4 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.freebsd#14 integrate .. //depot/projects/mips/usr.bin/fetch/fetch.1#7 integrate .. //depot/projects/mips/usr.bin/find/ls.c#3 integrate .. //depot/projects/mips/usr.bin/killall/killall.c#7 integrate .. //depot/projects/mips/usr.bin/locale/locale.c#3 integrate .. //depot/projects/mips/usr.bin/lock/lock.c#4 integrate .. //depot/projects/mips/usr.bin/make/make.1#5 integrate .. //depot/projects/mips/usr.bin/make/str.c#5 integrate .. //depot/projects/mips/usr.bin/mklocale/mklocale.1#7 integrate .. //depot/projects/mips/usr.bin/script/script.1#3 integrate .. //depot/projects/mips/usr.bin/script/script.c#2 integrate .. //depot/projects/mips/usr.bin/uuencode/uuencode.c#4 integrate .. //depot/projects/mips/usr.sbin/Makefile#15 integrate .. //depot/projects/mips/usr.sbin/acpi/acpiconf/acpiconf.8#5 integrate .. //depot/projects/mips/usr.sbin/apm/Makefile#4 integrate .. //depot/projects/mips/usr.sbin/apm/apm.8#5 integrate .. //depot/projects/mips/usr.sbin/apmd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/apmd/apmd.8#5 integrate .. //depot/projects/mips/usr.sbin/bluetooth/Makefile#6 integrate .. //depot/projects/mips/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c#3 integrate .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/Makefile#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/bgd.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/dun.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/ftrn.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/irmc.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/irmc_command.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/lan.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/log.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/log.h#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/main.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/opush.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/profile.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/profile.h#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/provider.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/provider.h#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sar.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/scr.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sd.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sdpd.8#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/server.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/server.h#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sp.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/srr.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/ssar.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/ssr.c#1 branch .. //depot/projects/mips/usr.sbin/bluetooth/sdpd/sur.c#1 branch .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/genfiles#2 delete .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/oid.h#2 delete .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/tree.c#2 delete .. //depot/projects/mips/usr.sbin/bsnmpd/bsnmpd/tree.h#2 delete .. //depot/projects/mips/usr.sbin/chkgrp/chkgrp.8#2 integrate .. //depot/projects/mips/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/mips/usr.sbin/getfmac/getfmac.c#2 integrate .. //depot/projects/mips/usr.sbin/getpmac/getpmac.c#2 integrate .. //depot/projects/mips/usr.sbin/i4b/isdnd/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/i4b/isdnmonitor/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/kldxref/kldxref.8#3 integrate .. //depot/projects/mips/usr.sbin/mixer/mixer.c#6 integrate .. //depot/projects/mips/usr.sbin/ndiscvt/inf.c#4 integrate .. //depot/projects/mips/usr.sbin/ofwdump/Makefile#3 integrate .. //depot/projects/mips/usr.sbin/ofwdump/ofwdump.8#3 integrate .. //depot/projects/mips/usr.sbin/pkg_install/add/extract.c#4 integrate .. //depot/projects/mips/usr.sbin/ppp/arp.c#2 integrate .. //depot/projects/mips/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/mips/usr.sbin/repquota/repquota.c#4 integrate .. //depot/projects/mips/usr.sbin/sa/main.c#3 integrate .. //depot/projects/mips/usr.sbin/syslogd/syslogd.c#9 integrate .. //depot/projects/mips/usr.sbin/watch/watch.c#4 integrate .. //depot/projects/mips/usr.sbin/wlconfig/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/wlconfig/wlconfig.8#2 integrate Differences ... ==== //depot/projects/mips/Makefile.inc1#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.401 2004/01/17 01:24:13 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.403 2004/01/23 16:22:48 harti Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -93,7 +93,7 @@ SUBDIR+= usr.sbin .endif -# etc must be last for "distribute" to work +# etc must be last for install/distribute to work .if exists(${.CURDIR}/etc) SUBDIR+= etc .endif @@ -432,13 +432,6 @@ @echo ">>> Installing everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN) - @echo - @echo "--------------------------------------------------------------" - @echo ">>> Rebuilding man page indices" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}/share/man; ${MAKE} makedb -.endif redistribute: @echo "--------------------------------------------------------------" @@ -658,6 +651,10 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif +.if ${BOOTSTRAPPING} < 501114 +_gensnmptree= usr.sbin/bsnmpd/gensnmptree +.endif + .if ${BOOTSTRAPPING} < 500019 _kbdcontrol= usr.sbin/kbdcontrol .endif @@ -678,6 +675,7 @@ ${_yacc} \ usr.sbin/config \ ${_crunchgen} \ + ${_gensnmptree} \ ${_kbdcontrol} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/mips/bin/ls/print.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.66 2003/10/16 07:07:20 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.67 2004/01/22 04:33:00 cperciva Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -624,9 +624,9 @@ unit = unit_adjust(&dbytes); if (dbytes == 0) - (void)printf("%*s ", (u_int)width, "0B"); + (void)printf("%*s ", 4, "0B"); else - (void)printf("%*.*f%c ", (u_int)width - 1, + (void)printf("%*.*f%c ", 3, dbytes > 10 ? 0 : 1, dbytes, "BKMGTPE"[unit]); } else (void)printf("%*jd ", (u_int)width, bytes); ==== //depot/projects/mips/bin/ps/ps.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.65 2003/09/08 19:57:13 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.66 2004/01/21 16:25:36 cperciva Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -211,24 +211,30 @@ The flags associated with the process as in the include file .In sys/proc.h : -.Bl -column P_NOCLDSTOP P_NOCLDSTOP +.Bl -column P_STOPPED_SINGLE 0x4000000 .It Dv "P_ADVLOCK" Ta No "0x00001 Process may hold a POSIX advisory lock" .It Dv "P_CONTROLT" Ta No "0x00002 Has a controlling terminal" -.It Dv "P_INMEM" Ta No "0x00004 Loaded into memory" -.It Dv "P_NOCLDSTOP" Ta No "0x00008 No SIGCHLD when children stop" +.It Dv "P_KTHREAD" Ta No "0x00004 Kernel thread" +.It Dv "P_NOLOAD" Ta No "0x00008 Ignore during load avg calculations" .It Dv "P_PPWAIT" Ta No "0x00010 Parent is waiting for child to exec/exit" .It Dv "P_PROFIL" Ta No "0x00020 Has started profiling" -.It Dv "P_SELECT" Ta No "0x00040 Selecting; wakeup/waiting danger" -.It Dv "P_SINTR" Ta No "0x00080 Sleep is interruptible" +.It Dv "P_STOPPROF" Ta No "0x00040 Has thread in requesting to stop prof" .It Dv "P_SUGID" Ta No "0x00100 Had set id privileges since last exec" .It Dv "P_SYSTEM" Ta No "0x00200 System proc: no sigs, stats or swapping" -.It Dv "P_TIMEOUT" Ta No "0x00400 Timing out during sleep" +.It Dv "P_SINGLE_EXIT" Ta No "0x00400 Threads suspending should exit, not wait" .It Dv "P_TRACED" Ta No "0x00800 Debugged process being traced" -.It Dv "P_WAITED" Ta No "0x01000 Debugging process has waited for child" +.It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_OWEUPC" Ta No "0x20000 Owe process an addupc() call at next ast" -.It Dv "P_SWAPPING" Ta No "0x40000 Process is being swapped" +.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" +.It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" +.It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" +.It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" +.It Dv "P_STOPPED_SINGLE" Ta No "0x80000 Only one thread can continue" +.It Dv "P_PROTECTED" Ta No "0x100000 Do not kill on memory overcommit" +.It Dv "P_SIGEVENT" Ta No "0x200000 Process pending signals changed" +.It Dv "P_JAILED" Ta No "0x1000000 Process is in jail" +.It Dv "P_INEXEC" Ta No "0x4000000 Process is in execve()" .El .It label The MAC label of the process. @@ -271,11 +277,6 @@ Marks a process in disk (or other short term, uninterruptible) wait. .It I Marks a process that is idle (sleeping for longer than about 20 seconds). -.It J -Marks a process which is in -.Xr jail 2 . -The hostname of the prison can be found in -.Ql /proc/<pid>/status . .It L Marks a process that is waiting to acquire a lock. .It R @@ -284,6 +285,8 @@ Marks a process that is sleeping for less than about 20 seconds. .It T Marks a stopped process. +.It W +Marks an idle interrupt thread. .It Z Marks a dead process (a ``zombie''). .El @@ -298,18 +301,13 @@ The process has raised .Tn CPU scheduling priority. -.It > -The process has specified a soft limit on memory requirements and is -currently exceeding that limit; such a process is (necessarily) not -swapped. -.It A -the process has asked for random page replacement -.Pf ( Dv MADV_RANDOM , -from -.Xr madvise 2 , -for example, lisp in a garbage collect). .It E The process is trying to exit. +.It J +Marks a process which is in +.Xr jail 2 . +The hostname of the prison can be found in +.Ql /proc/<pid>/status . .It L The process has pages locked in core (for example, for raw .Tn I/O ) . @@ -318,15 +316,6 @@ .Tn CPU scheduling priority (see .Xr setpriority 2 ) . -.It S -The process has asked for -.Tn FIFO -page replacement -.Pf ( Dv MADV_SEQUENTIAL , -from -.Xr madvise 2 , -for example, a large image processing program using virtual memory to -sequentially address voluminous data). .It s The process is a session leader. .It V ==== //depot/projects/mips/bin/sh/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.40 2003/05/02 06:26:32 obrien Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.41 2004/01/20 13:13:40 ru Exp $ PROG= sh SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ @@ -7,7 +7,7 @@ mystring.c options.c output.c parser.c redir.c show.c \ test.c trap.c var.c GENSRCS= builtins.c init.c nodes.c syntax.c -GENHDRS= builtins.h nodes.h syntax.h token.h y.tab.h +GENHDRS= builtins.h nodes.h syntax.h token.h SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} y.tab.h # MLINKS for Shell built in commands for which there are no userland ==== //depot/projects/mips/bin/sh/eval.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.39 2003/12/30 15:39:33 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.40 2004/01/21 12:50:01 des Exp $"); #include <paths.h> #include <signal.h> @@ -479,16 +479,14 @@ if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) { INTON; if (prevfd > 0) { - close(0); - copyfd(prevfd, 0); + dup2(prevfd, 0); close(prevfd); } if (pip[1] >= 0) { if (!(prevfd >= 0 && pip[0] == 0)) close(pip[0]); if (pip[1] != 1) { - close(1); - copyfd(pip[1], 1); + dup2(pip[1], 1); close(pip[1]); } } @@ -545,8 +543,7 @@ FORCEINTON; close(pip[0]); if (pip[1] != 1) { - close(1); - copyfd(pip[1], 1); + dup2(pip[1], 1); close(pip[1]); } evaltree(n, EV_EXIT); @@ -742,8 +739,7 @@ FORCEINTON; close(pip[0]); if (pip[1] != 1) { - close(1); - copyfd(pip[1], 1); + dup2(pip[1], 1); close(pip[1]); } } ==== //depot/projects/mips/bin/sh/input.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.20 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.21 2004/01/21 12:50:01 des Exp $"); #include <stdio.h> /* defines BUFSIZ */ #include <fcntl.h> @@ -388,7 +388,7 @@ if ((fd = open(fname, O_RDONLY)) < 0) error("Can't open %s: %s", fname, strerror(errno)); if (fd < 10) { - fd2 = copyfd(fd, 10); + fd2 = fcntl(fd, F_DUPFD, 10); close(fd); if (fd2 < 0) error("Out of file descriptors"); ==== //depot/projects/mips/bin/sh/parser.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.49 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.50 2004/01/21 12:50:01 des Exp $"); #include <stdlib.h> @@ -48,7 +48,6 @@ #include "parser.h" #include "nodes.h" #include "expand.h" /* defines rmescapes() */ -#include "redir.h" /* defines copyfd() */ #include "syntax.h" #include "options.h" #include "input.h" ==== //depot/projects/mips/bin/sh/redir.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.24 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.25 2004/01/21 12:50:01 des Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -182,8 +182,7 @@ error("cannot open %s: %s", fname, strerror(errno)); movefd: if (f != fd) { - close(fd); - copyfd(f, fd); + dup2(f, fd); close(f); } break; @@ -215,12 +214,11 @@ if (redir->ndup.dupfd >= 0) { /* if not ">&-" */ if (memory[redir->ndup.dupfd]) memory[fd] = 1; - else { - close(fd); - copyfd(redir->ndup.dupfd, fd); - } - } else + else + dup2(redir->ndup.dupfd, fd); + } else { close(fd); + } break; case NHERE: case NXHERE: @@ -288,10 +286,11 @@ if (rp->renamed[i] != EMPTY) { if (i == 0) fd0_redirected--; - close(i); if (rp->renamed[i] >= 0) { - copyfd(rp->renamed[i], i); + dup2(rp->renamed[i], i); close(rp->renamed[i]); + } else { + close(i); } } } @@ -346,26 +345,3 @@ } } } - - - -/* - * Copy a file descriptor to be >= to. Returns -1 - * if the source file descriptor is closed, EMPTY if there are no unused - * file descriptors left. - */ - -int -copyfd(int from, int to) -{ - int newfd; - - newfd = fcntl(from, F_DUPFD, to); - if (newfd < 0) { - if (errno == EMFILE) - return EMPTY; - else - error("%d: %s", from, strerror(errno)); - } - return newfd; -} ==== //depot/projects/mips/bin/sh/redir.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)redir.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/redir.h,v 1.8 2002/02/02 06:50:47 imp Exp $ + * $FreeBSD: src/bin/sh/redir.h,v 1.9 2004/01/21 12:50:01 des Exp $ */ /* flags passed to redirect */ @@ -46,5 +46,4 @@ void popredir(void); int fd0_redirected_p(void); void clearredir(void); -int copyfd(int, int); ==== //depot/projects/mips/contrib/bsnmp/NEWS#2 (text+ko) ==== @@ -1,3 +1,24 @@ +09-Dec-2003 + First step on factoring out the transport mapping stuff into + loadable modules. + + Local stream sockets that check the clients privileges. + +03-Dec-2003 + Bump version to 1.5 but leave library version intact. + +03-Dec-2003 + Now works with libbegemot polling stuff instead of libisc. + Use --with-libbegemot[=path] to configure. + +03-Dec-2003 + Fix parsing of non-minimal ASN.1 integers. They are now disallowed. + Non-minimal lengths are allowed. + + Remove copyright clause 3 everywhere. + + Make an autoconf build infrastructure. + 08-Nov-2003 WARNS=6 fixed. ==== //depot/projects/mips/contrib/bsnmp/README#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Mon Nov 10 09:50:22 CET 2003 +Fri Dec 5 15:01:16 CET 2003 This is a mini-SNMP daemon. The basic daemon implements the system group and a number of private extensions to manage the UDP transport mapping, @@ -13,16 +13,16 @@ Installation ------------ -You need to apply the patch in the patches directory to your system sources. -This adds a sysctl to retrieve multicast address information from the kernel. - As usual by doing: - make obj ; make depend ; make ; make install + configure [--with-libbegemot[=path]] + make + make install This does not install a configuration file. The standard location for the configuration is /etc/snmpd.config, but can be overwritten on the command -line. An example configuration file is provided. +line. An example configuration file is provided. Use --with-libbegemot +to use libbegemot instead of libisc. Running ------- ==== //depot/projects/mips/contrib/bsnmp/TODO#2 (text+ko) ==== @@ -1,5 +1,17 @@ snmpd_mibII: - handle HC counters by periodically polling the kernel counters. -snmpd_netgraph: - - make some tables writeable +snmpd: + - rethink transports a little bit: make them loadable and make + a private subtree for transports: + OK. Table not writeable yet. + + There should be a transport table that is indexed by the transport name. + This table can be used to load/unload transports at run time. + OK. Table not writeable yet. + + Then there can be a port table that is indexed by transport name and + port name. Plus a transport-specific table indexed by port name only. + + The transport table could contain a column of type OID that points + to the transport-specific table. ==== //depot/projects/mips/contrib/bsnmp/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.4 +1.5a ==== //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.1#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.1 2002/08/15 13:27:44 hbb Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.2 2003/12/03 09:56:57 hbb Exp $ .\" .\" Author: Harti Brandt <harti@freebsd.org> .\" ==== //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.34 2003/01/28 13:44:34 hbb Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.36 2003/12/03 09:56:57 hbb Exp $ * * Generate OID table from table description. * ==== //depot/projects/mips/contrib/bsnmp/lib/asn1.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/asn1.3,v 1.2 2002/08/16 10:02:53 hbb Exp $ +.\" $Begemot: bsnmp/lib/asn1.3,v 1.3 2003/12/02 15:45:48 hbb Exp $ .\" .Dd August 15, 2002 .Dt asn1 3 ==== //depot/projects/mips/contrib/bsnmp/lib/asn1.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.24 2003/01/28 13:44:34 hbb Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.27 2003/12/08 17:11:58 hbb Exp $ * * ASN.1 for SNMP. */ @@ -244,6 +244,13 @@ err = ASN_ERR_OK; if (len > 8) err = ASN_ERR_RANGE; + else if (len > 1 && + ((*b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) || + (*b->asn_cptr == 0xff && (b->asn_cptr[1] & 0x80) == 0x80))) { + asn_error(b, "non-minimal integer"); + err = ASN_ERR_BADLEN; + } + if (*b->asn_cptr & 0x80) neg = 1; val = 0; @@ -332,6 +339,10 @@ /* negative integer or too larger */ *vp = 0xffffffffffffffffULL; err = ASN_ERR_RANGE; + } else if (len > 1 && + *b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) { + asn_error(b, "non-minimal unsigned"); + err = ASN_ERR_BADLEN; } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401260211.i0Q2BSNq048384>