PERFORCE change 98298 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Jun 2 03:59:04 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=98298
Change 98298 by marcel at marcel_nfs on 2006/06/02 03:57:13
IFC @98296
Affected files ...
.. //depot/projects/tty/MAINTAINERS#19 integrate
.. //depot/projects/tty/Makefile#17 integrate
.. //depot/projects/tty/Makefile.inc1#29 integrate
.. //depot/projects/tty/ObsoleteFiles.inc#6 integrate
.. //depot/projects/tty/contrib/bsnmp/NEWS#9 integrate
.. //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.1#5 integrate
.. //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.c#3 integrate
.. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.1#7 integrate
.. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.c#9 integrate
.. //depot/projects/tty/contrib/netcat/atomicio.c#2 integrate
.. //depot/projects/tty/contrib/netcat/atomicio.h#1 branch
.. //depot/projects/tty/contrib/netcat/nc.1#4 integrate
.. //depot/projects/tty/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/tty/contrib/netcat/socks.c#2 integrate
.. //depot/projects/tty/etc/bluetooth/hcsecd.conf#3 integrate
.. //depot/projects/tty/etc/defaults/rc.conf#21 integrate
.. //depot/projects/tty/etc/devd.conf#19 integrate
.. //depot/projects/tty/etc/hosts.allow#4 integrate
.. //depot/projects/tty/etc/netstart#7 integrate
.. //depot/projects/tty/etc/rc.d/Makefile#16 integrate
.. //depot/projects/tty/etc/rc.d/bridge#1 branch
.. //depot/projects/tty/etc/rc.d/devd#6 integrate
.. //depot/projects/tty/etc/rc.d/jail#12 integrate
.. //depot/projects/tty/etc/rc.d/mdconfig#1 branch
.. //depot/projects/tty/etc/rc.d/mdconfig2#1 branch
.. //depot/projects/tty/etc/rc.d/netif#10 integrate
.. //depot/projects/tty/etc/rc.d/sysctl#5 integrate
.. //depot/projects/tty/etc/rc.subr#13 integrate
.. //depot/projects/tty/games/fortune/datfiles/fortunes#24 integrate
.. //depot/projects/tty/include/arpa/nameser.h#3 integrate
.. //depot/projects/tty/include/glob.h#2 integrate
.. //depot/projects/tty/include/netdb.h#13 integrate
.. //depot/projects/tty/include/res_update.h#2 integrate
.. //depot/projects/tty/include/resolv.h#8 integrate
.. //depot/projects/tty/kerberos5/lib/libroken/Makefile#4 integrate
.. //depot/projects/tty/lib/csu/common/crtbegin.c#2 delete
.. //depot/projects/tty/lib/csu/common/crtend.c#2 delete
.. //depot/projects/tty/lib/libatm/Makefile#6 integrate
.. //depot/projects/tty/lib/libc/Makefile#11 integrate
.. //depot/projects/tty/lib/libc/arm/SYS.h#3 integrate
.. //depot/projects/tty/lib/libc/gen/getgrent.c#5 integrate
.. //depot/projects/tty/lib/libc/gen/gethostname.c#4 integrate
.. //depot/projects/tty/lib/libc/gen/glob.3#5 integrate
.. //depot/projects/tty/lib/libc/gen/glob.c#5 integrate
.. //depot/projects/tty/lib/libc/gen/signal.3#6 integrate
.. //depot/projects/tty/lib/libc/include/isc/list.h#1 branch
.. //depot/projects/tty/lib/libc/nameser/Symbol.map#2 integrate
.. //depot/projects/tty/lib/libc/nameser/ns_samedomain.c#2 integrate
.. //depot/projects/tty/lib/libc/net/Makefile.inc#11 integrate
.. //depot/projects/tty/lib/libc/net/Symbol.map#2 integrate
.. //depot/projects/tty/lib/libc/net/gai_strerror.3#4 integrate
.. //depot/projects/tty/lib/libc/net/gai_strerror.c#2 integrate
.. //depot/projects/tty/lib/libc/net/gethostnamadr.c#8 integrate
.. //depot/projects/tty/lib/libc/net/getnameinfo.c#6 integrate
.. //depot/projects/tty/lib/libc/net/res_mkupdate.c#5 delete
.. //depot/projects/tty/lib/libc/net/res_update.c#3 delete
.. //depot/projects/tty/lib/libc/resolv/Makefile.inc#2 integrate
.. //depot/projects/tty/lib/libc/resolv/Symbol.map#2 integrate
.. //depot/projects/tty/lib/libc/resolv/h_errno.c#2 integrate
.. //depot/projects/tty/lib/libc/resolv/res_findzonecut.c#1 branch
.. //depot/projects/tty/lib/libc/resolv/res_mkupdate.c#1 branch
.. //depot/projects/tty/lib/libc/resolv/res_state.c#2 integrate
.. //depot/projects/tty/lib/libc/resolv/res_update.c#1 branch
.. //depot/projects/tty/lib/libc/stdlib/a64l.c#2 integrate
.. //depot/projects/tty/lib/libc/stdlib/strtol.3#3 integrate
.. //depot/projects/tty/lib/libc/stdlib/strtoul.3#3 integrate
.. //depot/projects/tty/lib/libc/sys/truncate.2#4 integrate
.. //depot/projects/tty/lib/libc/sys/wait.2#7 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_spec.c#4 integrate
.. //depot/projects/tty/lib/libutil/Makefile#8 integrate
.. //depot/projects/tty/lib/libutil/kld.c#2 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/Makefile#3 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/alpha/Makefile#2 delete
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#3 delete
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/common/install.sgml#8 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#4 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile#2 delete
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#4 delete
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#36 integrate
.. //depot/projects/tty/release/pc98/fixit-small_crunch.conf#7 integrate
.. //depot/projects/tty/sbin/dhclient/dhclient.c#6 integrate
.. //depot/projects/tty/sbin/ipfw/ipfw.8#24 integrate
.. //depot/projects/tty/sbin/ipfw/ipfw2.c#21 integrate
.. //depot/projects/tty/sbin/mount/mount.8#13 integrate
.. //depot/projects/tty/sbin/mount_msdosfs/mount_msdosfs.c#9 integrate
.. //depot/projects/tty/sbin/mount_std/mount_std.8#6 integrate
.. //depot/projects/tty/sbin/rcorder/rcorder.c#5 integrate
.. //depot/projects/tty/share/examples/kld/cdev/module/cdevmod.c#4 integrate
.. //depot/projects/tty/share/examples/mdoc/example.4#6 integrate
.. //depot/projects/tty/share/man/man4/Makefile#26 integrate
.. //depot/projects/tty/share/man/man4/acpi_dock.4#1 branch
.. //depot/projects/tty/share/man/man4/aha.4#7 integrate
.. //depot/projects/tty/share/man/man4/ahb.4#5 integrate
.. //depot/projects/tty/share/man/man4/ahc.4#7 integrate
.. //depot/projects/tty/share/man/man4/ahd.4#4 integrate
.. //depot/projects/tty/share/man/man4/altq.4#7 integrate
.. //depot/projects/tty/share/man/man4/arcmsr.4#2 integrate
.. //depot/projects/tty/share/man/man4/ciss.4#8 integrate
.. //depot/projects/tty/share/man/man4/geom.4#10 integrate
.. //depot/projects/tty/share/man/man4/hptmv.4#4 integrate
.. //depot/projects/tty/share/man/man4/ida.4#5 integrate
.. //depot/projects/tty/share/man/man4/if_bridge.4#10 integrate
.. //depot/projects/tty/share/man/man4/isp.4#9 integrate
.. //depot/projects/tty/share/man/man4/ispfw.4#4 integrate
.. //depot/projects/tty/share/man/man4/lmc.4#7 integrate
.. //depot/projects/tty/share/man/man4/mlx.4#6 integrate
.. //depot/projects/tty/share/man/man4/mly.4#4 integrate
.. //depot/projects/tty/share/man/man4/mpt.4#5 integrate
.. //depot/projects/tty/share/man/man4/pst.4#3 integrate
.. //depot/projects/tty/share/man/man4/sio.4#8 integrate
.. //depot/projects/tty/share/man/man4/trm.4#4 integrate
.. //depot/projects/tty/share/man/man4/twa.4#6 integrate
.. //depot/projects/tty/share/man/man4/twe.4#8 integrate
.. //depot/projects/tty/share/man/man5/devfs.5#4 integrate
.. //depot/projects/tty/share/man/man5/linprocfs.5#4 integrate
.. //depot/projects/tty/share/man/man5/nsswitch.conf.5#6 integrate
.. //depot/projects/tty/share/man/man5/procfs.5#5 integrate
.. //depot/projects/tty/share/man/man5/rc.conf.5#28 integrate
.. //depot/projects/tty/share/man/man9/Makefile#19 integrate
.. //depot/projects/tty/share/man/man9/crypto.9#6 integrate
.. //depot/projects/tty/share/man/man9/device_get_sysctl.9#1 branch
.. //depot/projects/tty/share/misc/bsd-family-tree#19 integrate
.. //depot/projects/tty/share/misc/iso3166#5 integrate
.. //depot/projects/tty/sys/Makefile#9 integrate
.. //depot/projects/tty/sys/amd64/amd64/busdma_machdep.c#12 integrate
.. //depot/projects/tty/sys/amd64/include/clock.h#6 integrate
.. //depot/projects/tty/sys/amd64/include/mutex.h#3 integrate
.. //depot/projects/tty/sys/arm/arm/busdma_machdep.c#9 integrate
.. //depot/projects/tty/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/tty/sys/arm/arm/pmap.c#15 integrate
.. //depot/projects/tty/sys/arm/at91/at91.c#3 integrate
.. //depot/projects/tty/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/tty/sys/arm/include/cpuconf.h#4 integrate
.. //depot/projects/tty/sys/arm/include/cpufunc.h#5 integrate
.. //depot/projects/tty/sys/arm/include/pmap.h#10 integrate
.. //depot/projects/tty/sys/arm/sa11x0/assabet_machdep.c#5 integrate
.. //depot/projects/tty/sys/arm/sa11x0/sa11x0_io.c#5 integrate
.. //depot/projects/tty/sys/arm/sa11x0/sa11x0_reg.h#2 integrate
.. //depot/projects/tty/sys/arm/sa11x0/sa11x0_var.h#3 integrate
.. //depot/projects/tty/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate
.. //depot/projects/tty/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate
.. //depot/projects/tty/sys/arm/xscale/i80321/i80321_space.c#4 integrate
.. //depot/projects/tty/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate
.. //depot/projects/tty/sys/boot/i386/libi386/biosdisk.c#8 integrate
.. //depot/projects/tty/sys/cam/cam_ccb.h#7 integrate
.. //depot/projects/tty/sys/cam/cam_periph.c#13 integrate
.. //depot/projects/tty/sys/cam/cam_xpt.c#15 integrate
.. //depot/projects/tty/sys/cam/scsi/scsi_all.h#5 integrate
.. //depot/projects/tty/sys/cam/scsi/scsi_target.c#12 integrate
.. //depot/projects/tty/sys/conf/Makefile.arm#10 integrate
.. //depot/projects/tty/sys/conf/files#45 integrate
.. //depot/projects/tty/sys/conf/files.amd64#27 integrate
.. //depot/projects/tty/sys/conf/kern.mk#10 integrate
.. //depot/projects/tty/sys/conf/kmod.mk#17 integrate
.. //depot/projects/tty/sys/conf/options#32 integrate
.. //depot/projects/tty/sys/dev/ahb/ahb.c#9 integrate
.. //depot/projects/tty/sys/dev/bfe/if_bfe.c#16 integrate
.. //depot/projects/tty/sys/dev/bfe/if_bfereg.h#7 integrate
.. //depot/projects/tty/sys/dev/bktr/bktr_os.c#14 integrate
.. //depot/projects/tty/sys/dev/ciss/ciss.c#22 integrate
.. //depot/projects/tty/sys/dev/dcons/dcons_os.c#4 integrate
.. //depot/projects/tty/sys/dev/digi/digi.c#11 integrate
.. //depot/projects/tty/sys/dev/hifn/hifn7751.c#13 integrate
.. //depot/projects/tty/sys/dev/hme/if_hme.c#15 integrate
.. //depot/projects/tty/sys/dev/ic/ns16550.h#5 integrate
.. //depot/projects/tty/sys/dev/isp/isp_freebsd.c#12 integrate
.. //depot/projects/tty/sys/dev/isp/isp_freebsd.h#11 integrate
.. //depot/projects/tty/sys/dev/isp/isp_pci.c#12 integrate
.. //depot/projects/tty/sys/dev/isp/isp_tpublic.h#6 integrate
.. //depot/projects/tty/sys/dev/isp/ispvar.h#9 integrate
.. //depot/projects/tty/sys/dev/le/if_le_cbus.c#2 integrate
.. //depot/projects/tty/sys/dev/mfi/mfi.c#2 integrate
.. //depot/projects/tty/sys/dev/mfi/mfi_disk.c#2 integrate
.. //depot/projects/tty/sys/dev/mfi/mfi_ioctl.h#2 integrate
.. //depot/projects/tty/sys/dev/mfi/mfi_linux.c#1 branch
.. //depot/projects/tty/sys/dev/mfi/mfi_pci.c#2 integrate
.. //depot/projects/tty/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/tty/sys/dev/mfi/mfivar.h#2 integrate
.. //depot/projects/tty/sys/dev/mii/ukphy_subr.c#5 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt.c#8 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt.h#10 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_cam.c#5 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_cam.h#3 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_debug.c#8 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_pci.c#12 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_raid.c#5 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_raid.h#2 integrate
.. //depot/projects/tty/sys/dev/mpt/mpt_reg.h#3 integrate
.. //depot/projects/tty/sys/dev/nve/if_nve.c#12 integrate
.. //depot/projects/tty/sys/dev/ofw/ofw_console.c#12 integrate
.. //depot/projects/tty/sys/dev/pccbb/pccbb.c#17 integrate
.. //depot/projects/tty/sys/dev/pccbb/pccbb_pci.c#8 integrate
.. //depot/projects/tty/sys/dev/pccbb/pccbbvar.h#8 integrate
.. //depot/projects/tty/sys/dev/pci/fixup_pci.c#4 integrate
.. //depot/projects/tty/sys/dev/pci/pcireg.h#11 integrate
.. //depot/projects/tty/sys/dev/re/if_re.c#18 integrate
.. //depot/projects/tty/sys/dev/safe/safe.c#6 integrate
.. //depot/projects/tty/sys/dev/sio/sio.c#20 integrate
.. //depot/projects/tty/sys/dev/sound/midi/midi.c#5 branch
.. //depot/projects/tty/sys/dev/sound/midi/midi.h#4 branch
.. //depot/projects/tty/sys/dev/sound/midi/midiq.h#1 branch
.. //depot/projects/tty/sys/dev/sound/midi/mpu401.c#1 branch
.. //depot/projects/tty/sys/dev/sound/midi/mpu401.h#1 branch
.. //depot/projects/tty/sys/dev/sound/midi/mpu_if.m#1 branch
.. //depot/projects/tty/sys/dev/sound/midi/mpufoi_if.m#1 branch
.. //depot/projects/tty/sys/dev/sound/midi/sequencer.c#5 branch
.. //depot/projects/tty/sys/dev/sound/midi/sequencer.h#3 branch
.. //depot/projects/tty/sys/dev/sound/midi/synth_if.m#1 branch
.. //depot/projects/tty/sys/dev/sound/pci/cmi.c#11 integrate
.. //depot/projects/tty/sys/dev/sound/pci/emu10k1.c#10 integrate
.. //depot/projects/tty/sys/dev/syscons/apm/apm_saver.c#5 integrate
.. //depot/projects/tty/sys/dev/syscons/syscons.c#21 integrate
.. //depot/projects/tty/sys/dev/uart/uart.h#4 integrate
.. //depot/projects/tty/sys/dev/uart/uart_dbg.c#3 integrate
.. //depot/projects/tty/sys/dev/uart/uart_dev_ns8250.c#6 integrate
.. //depot/projects/tty/sys/dev/uart/uart_tty.c#10 integrate
.. //depot/projects/tty/sys/dev/ubsec/ubsec.c#12 integrate
.. //depot/projects/tty/sys/dev/usb/ehci.c#12 integrate
.. //depot/projects/tty/sys/dev/usb/ehci_pci.c#12 integrate
.. //depot/projects/tty/sys/dev/usb/ehcivar.h#7 integrate
.. //depot/projects/tty/sys/dev/usb/if_axe.c#13 integrate
.. //depot/projects/tty/sys/dev/usb/if_axereg.h#7 integrate
.. //depot/projects/tty/sys/dev/usb/ohci.c#15 integrate
.. //depot/projects/tty/sys/dev/usb/ohci_pci.c#14 integrate
.. //depot/projects/tty/sys/dev/usb/ohcireg.h#5 integrate
.. //depot/projects/tty/sys/dev/usb/ohcivar.h#9 integrate
.. //depot/projects/tty/sys/dev/usb/sl811hs.c#3 integrate
.. //depot/projects/tty/sys/dev/usb/sl811hsvar.h#2 integrate
.. //depot/projects/tty/sys/dev/usb/uhci.c#14 integrate
.. //depot/projects/tty/sys/dev/usb/uhci_pci.c#11 integrate
.. //depot/projects/tty/sys/dev/usb/uhcivar.h#6 integrate
.. //depot/projects/tty/sys/dev/usb/usb.c#13 integrate
.. //depot/projects/tty/sys/dev/usb/usb_mem.c#6 integrate
.. //depot/projects/tty/sys/dev/usb/usbdi.c#10 integrate
.. //depot/projects/tty/sys/dev/usb/usbdivar.h#6 integrate
.. //depot/projects/tty/sys/dev/zs/zs.c#13 integrate
.. //depot/projects/tty/sys/doc/subsys/Dependencies#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-cam#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-crypto#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-dev_pci#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-dev_sound#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-dev_usb#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-geom#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-i4b#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-kern#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-libkern#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-linux#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-net80211#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-netgraph#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-netinet#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-netinet6#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-netipsec#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-opencrypto#1 branch
.. //depot/projects/tty/sys/doc/subsys/Doxyfile-vm#1 branch
.. //depot/projects/tty/sys/doc/subsys/Makefile#1 branch
.. //depot/projects/tty/sys/doc/subsys/README#1 branch
.. //depot/projects/tty/sys/doc/subsys/common-Doxyfile#1 branch
.. //depot/projects/tty/sys/doc/subsys/notreviewed.dox#1 branch
.. //depot/projects/tty/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate
.. //depot/projects/tty/sys/fs/ntfs/ntfs_vfsops.c#11 integrate
.. //depot/projects/tty/sys/fs/nullfs/null_vfsops.c#12 integrate
.. //depot/projects/tty/sys/fs/nwfs/nwfs_io.c#11 integrate
.. //depot/projects/tty/sys/fs/procfs/procfs.c#5 integrate
.. //depot/projects/tty/sys/fs/smbfs/smbfs_io.c#11 integrate
.. //depot/projects/tty/sys/fs/smbfs/smbfs_vnops.c#12 integrate
.. //depot/projects/tty/sys/fs/udf/udf_vfsops.c#14 integrate
.. //depot/projects/tty/sys/gdb/gdb.h#3 integrate
.. //depot/projects/tty/sys/gdb/gdb_cons.c#2 integrate
.. //depot/projects/tty/sys/gdb/gdb_main.c#5 integrate
.. //depot/projects/tty/sys/gdb/gdb_packet.c#3 integrate
.. //depot/projects/tty/sys/geom/geom_bsd.c#14 integrate
.. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/tty/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_attr.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_bit.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_inode.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_trans.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate
.. //depot/projects/tty/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate
.. //depot/projects/tty/sys/i386/bios/apm.c#9 integrate
.. //depot/projects/tty/sys/i386/bios/apm.h#4 integrate
.. //depot/projects/tty/sys/i386/i386/busdma_machdep.c#15 integrate
.. //depot/projects/tty/sys/i386/i386/initcpu.c#8 integrate
.. //depot/projects/tty/sys/i386/i386/machdep.c#21 integrate
.. //depot/projects/tty/sys/i386/i386/ptrace_machdep.c#4 integrate
.. //depot/projects/tty/sys/i386/i386/vm_machdep.c#18 integrate
.. //depot/projects/tty/sys/i386/include/clock.h#9 integrate
.. //depot/projects/tty/sys/i386/include/md_var.h#13 integrate
.. //depot/projects/tty/sys/i386/include/mutex.h#2 integrate
.. //depot/projects/tty/sys/i386/include/npx.h#5 integrate
.. //depot/projects/tty/sys/i386/isa/npx.c#16 integrate
.. //depot/projects/tty/sys/ia64/ia64/busdma_machdep.c#12 integrate
.. //depot/projects/tty/sys/ia64/ia64/ssc.c#11 integrate
.. //depot/projects/tty/sys/isofs/cd9660/cd9660_vfsops.c#13 integrate
.. //depot/projects/tty/sys/kern/kern_exec.c#24 integrate
.. //depot/projects/tty/sys/kern/kern_exit.c#21 integrate
.. //depot/projects/tty/sys/kern/kern_linker.c#12 integrate
.. //depot/projects/tty/sys/kern/kern_switch.c#21 integrate
.. //depot/projects/tty/sys/kern/kern_umtx.c#11 integrate
.. //depot/projects/tty/sys/kern/subr_disk.c#11 integrate
.. //depot/projects/tty/sys/kern/subr_stack.c#2 integrate
.. //depot/projects/tty/sys/kern/subr_taskqueue.c#13 integrate
.. //depot/projects/tty/sys/kern/tty_cons.c#11 integrate
.. //depot/projects/tty/sys/kern/uipc_syscalls.c#19 integrate
.. //depot/projects/tty/sys/kern/vfs_mount.c#22 integrate
.. //depot/projects/tty/sys/kern/vfs_subr.c#27 integrate
.. //depot/projects/tty/sys/kern/vnode_if.src#9 integrate
.. //depot/projects/tty/sys/modules/Makefile#29 integrate
.. //depot/projects/tty/sys/modules/acpi/acpi/Makefile#6 integrate
.. //depot/projects/tty/sys/modules/acpi/acpi_asus/Makefile#4 integrate
.. //depot/projects/tty/sys/modules/acpi/acpi_panasonic/Makefile#3 integrate
.. //depot/projects/tty/sys/modules/acpi/acpi_toshiba/Makefile#4 integrate
.. //depot/projects/tty/sys/modules/acpi/acpi_video/Makefile#5 integrate
.. //depot/projects/tty/sys/modules/cpufreq/Makefile#2 integrate
.. //depot/projects/tty/sys/modules/fdc/Makefile#5 integrate
.. //depot/projects/tty/sys/modules/geom/geom_eli/Makefile#3 integrate
.. //depot/projects/tty/sys/modules/mfi/Makefile#2 integrate
.. //depot/projects/tty/sys/modules/mfi/mfi_linux/Makefile#1 branch
.. //depot/projects/tty/sys/modules/sound/driver/cmi/Makefile#3 integrate
.. //depot/projects/tty/sys/modules/sound/driver/emu10k1/Makefile#4 integrate
.. //depot/projects/tty/sys/modules/sound/sound/Makefile#4 integrate
.. //depot/projects/tty/sys/net/bpf.c#19 integrate
.. //depot/projects/tty/sys/net/bpf_filter.c#5 integrate
.. //depot/projects/tty/sys/net/if.c#23 integrate
.. //depot/projects/tty/sys/net/if_tap.c#17 integrate
.. //depot/projects/tty/sys/net80211/ieee80211_node.c#12 integrate
.. //depot/projects/tty/sys/netinet/ip_fw.h#16 integrate
.. //depot/projects/tty/sys/netinet/ip_fw2.c#28 integrate
.. //depot/projects/tty/sys/netinet/ip_mroute.c#16 integrate
.. //depot/projects/tty/sys/netinet/ip_output.c#21 integrate
.. //depot/projects/tty/sys/netinet/raw_ip.c#18 integrate
.. //depot/projects/tty/sys/netinet/udp_usrreq.c#18 integrate
.. //depot/projects/tty/sys/netinet6/in6_src.c#11 integrate
.. //depot/projects/tty/sys/netinet6/udp6_usrreq.c#13 integrate
.. //depot/projects/tty/sys/netipsec/key.c#10 integrate
.. //depot/projects/tty/sys/nfs4client/nfs4_vfsops.c#7 integrate
.. //depot/projects/tty/sys/nfs4client/nfs4_vnops.c#7 integrate
.. //depot/projects/tty/sys/nfsclient/nfs.h#7 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_bio.c#16 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_nfsiod.c#10 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_node.c#11 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_socket.c#21 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_subs.c#13 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_vfsops.c#20 integrate
.. //depot/projects/tty/sys/nfsclient/nfs_vnops.c#18 integrate
.. //depot/projects/tty/sys/nfsclient/nfsmount.h#7 integrate
.. //depot/projects/tty/sys/nfsclient/nfsnode.h#9 integrate
.. //depot/projects/tty/sys/opencrypto/crypto.c#8 integrate
.. //depot/projects/tty/sys/opencrypto/cryptodev.c#14 integrate
.. //depot/projects/tty/sys/opencrypto/cryptodev.h#7 integrate
.. //depot/projects/tty/sys/pc98/cbus/sio.c#5 integrate
.. //depot/projects/tty/sys/pci/agp_amd64.c#7 integrate
.. //depot/projects/tty/sys/pci/agp_sis.c#10 integrate
.. //depot/projects/tty/sys/pci/if_rlreg.h#15 integrate
.. //depot/projects/tty/sys/posix4/ksched.c#6 integrate
.. //depot/projects/tty/sys/posix4/p1003_1b.c#6 integrate
.. //depot/projects/tty/sys/security/audit/audit_bsm_klib.c#2 integrate
.. //depot/projects/tty/sys/sparc64/include/pmap.h#9 integrate
.. //depot/projects/tty/sys/sparc64/sparc64/pmap.c#17 integrate
.. //depot/projects/tty/sys/sys/cons.h#6 integrate
.. //depot/projects/tty/sys/sys/elf_common.h#5 integrate
.. //depot/projects/tty/sys/sys/kernel.h#13 integrate
.. //depot/projects/tty/sys/sys/proc.h#23 integrate
.. //depot/projects/tty/sys/sys/queue.h#9 integrate
.. //depot/projects/tty/sys/tools/vnode_if.awk#8 integrate
.. //depot/projects/tty/sys/ufs/ffs/ffs_vfsops.c#21 integrate
.. //depot/projects/tty/sys/ufs/ufs/dinode.h#4 integrate
.. //depot/projects/tty/sys/ufs/ufs/ufs_vnops.c#16 integrate
.. //depot/projects/tty/sys/vm/uma_core.c#18 integrate
.. //depot/projects/tty/sys/vm/vm_extern.h#10 integrate
.. //depot/projects/tty/sys/vm/vm_glue.c#13 integrate
.. //depot/projects/tty/sys/vm/vm_map.c#17 integrate
.. //depot/projects/tty/sys/vm/vm_map.h#10 integrate
.. //depot/projects/tty/sys/vm/vm_meter.c#9 integrate
.. //depot/projects/tty/sys/vm/vm_page.c#16 integrate
.. //depot/projects/tty/tools/build/options/makeman#3 integrate
.. //depot/projects/tty/tools/debugscripts/dot.gdbinit#5 integrate
.. //depot/projects/tty/tools/regression/execve/Makefile#1 branch
.. //depot/projects/tty/tools/regression/execve/doexec.c#1 branch
.. //depot/projects/tty/tools/regression/execve/execve.t#1 branch
.. //depot/projects/tty/tools/regression/execve/tests/badinterplen#1 branch
.. //depot/projects/tty/tools/regression/execve/tests/devnullscript#1 branch
.. //depot/projects/tty/tools/regression/execve/tests/goodaout.c#1 branch
.. //depot/projects/tty/tools/regression/execve/tests/goodscript#1 branch
.. //depot/projects/tty/tools/regression/execve/tests/nonexistshell#1 branch
.. //depot/projects/tty/tools/regression/execve/tests/scriptarg#1 branch
.. //depot/projects/tty/tools/regression/execve/tests/scriptarg-nospace#1 branch
.. //depot/projects/tty/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate
.. //depot/projects/tty/tools/regression/netinet/rawconnect/rawconnect.t#1 branch
.. //depot/projects/tty/tools/regression/sockets/sendfile/Makefile#1 branch
.. //depot/projects/tty/tools/regression/sockets/sendfile/sendfile.c#1 branch
.. //depot/projects/tty/tools/regression/sockets/socketpair/Makefile#3 integrate
.. //depot/projects/tty/tools/regression/sockets/unix_cmsg/Makefile#1 branch
.. //depot/projects/tty/tools/regression/sockets/unix_cmsg/README#1 branch
.. //depot/projects/tty/tools/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch
.. //depot/projects/tty/tools/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch
.. //depot/projects/tty/tools/tools/README#14 integrate
.. //depot/projects/tty/tools/tools/crypto/cryptotest.c#7 integrate
.. //depot/projects/tty/tools/tools/crypto/ubsecstats.c#3 integrate
.. //depot/projects/tty/tools/tools/recoverdisk/Makefile#3 integrate
.. //depot/projects/tty/tools/tools/recoverdisk/recoverdisk.c#4 integrate
.. //depot/projects/tty/tools/tools/tinderbox/.cvsignore#2 delete
.. //depot/projects/tty/tools/tools/tinderbox/Makefile#5 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/Makefile#6 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/default.rc#6 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/head.rc#4 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/releng_4.rc#8 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/releng_5.rc#6 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/releng_6.rc#5 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/update_head.rc#3 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/update_releng_4.rc#4 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/update_releng_5.rc#4 delete
.. //depot/projects/tty/tools/tools/tinderbox/etc/update_releng_6.rc#4 delete
.. //depot/projects/tty/tools/tools/tinderbox/powerpc.diff#2 delete
.. //depot/projects/tty/tools/tools/tinderbox/tbmaster.1#11 delete
.. //depot/projects/tty/tools/tools/tinderbox/tbmaster.pl#16 delete
.. //depot/projects/tty/tools/tools/tinderbox/tinderbox.1#9 delete
.. //depot/projects/tty/tools/tools/tinderbox/tinderbox.pl#16 delete
.. //depot/projects/tty/tools/tools/tinderbox/www/.cvsignore#2 delete
.. //depot/projects/tty/tools/tools/tinderbox/www/Makefile#4 delete
.. //depot/projects/tty/tools/tools/tinderbox/www/daemon.png.uu#2 delete
.. //depot/projects/tty/tools/tools/tinderbox/www/index.cgi#9 delete
.. //depot/projects/tty/tools/tools/tinderbox/www/tb.css#4 delete
.. //depot/projects/tty/tools/tools/tinderbox/www/valid-css.png.uu#2 delete
.. //depot/projects/tty/tools/tools/tinderbox/www/valid-xhtml10.png.uu#2 delete
.. //depot/projects/tty/usr.bin/calendar/day.c#3 integrate
.. //depot/projects/tty/usr.bin/file/magic.5#5 integrate
.. //depot/projects/tty/usr.bin/find/find.1#9 integrate
.. //depot/projects/tty/usr.bin/find/function.c#9 integrate
.. //depot/projects/tty/usr.bin/id/id.c#6 integrate
.. //depot/projects/tty/usr.bin/kdump/Makefile#2 integrate
.. //depot/projects/tty/usr.bin/kdump/kdump.c#7 integrate
.. //depot/projects/tty/usr.bin/kdump/kdump_subr.h#1 branch
.. //depot/projects/tty/usr.bin/kdump/mksubr#1 branch
.. //depot/projects/tty/usr.bin/sed/process.c#6 integrate
.. //depot/projects/tty/usr.bin/systat/systat.1#9 integrate
.. //depot/projects/tty/usr.sbin/bluetooth/hccontrol/hccontrol.8#6 integrate
.. //depot/projects/tty/usr.sbin/bluetooth/hccontrol/hccontrol.c#4 integrate
.. //depot/projects/tty/usr.sbin/bluetooth/hccontrol/hccontrol.h#6 integrate
.. //depot/projects/tty/usr.sbin/bluetooth/hccontrol/node.c#4 integrate
.. //depot/projects/tty/usr.sbin/cron/cron/do_command.c#5 integrate
.. //depot/projects/tty/usr.sbin/cron/cron/popen.c#2 integrate
.. //depot/projects/tty/usr.sbin/gstat/Makefile#3 integrate
.. //depot/projects/tty/usr.sbin/gstat/gstat.8#6 integrate
.. //depot/projects/tty/usr.sbin/gstat/gstat.c#4 integrate
.. //depot/projects/tty/usr.sbin/ipfwpcap/Makefile#2 integrate
.. //depot/projects/tty/usr.sbin/ipfwpcap/ipfwpcap.8#1 branch
.. //depot/projects/tty/usr.sbin/jail/jail.8#21 integrate
.. //depot/projects/tty/usr.sbin/mountd/Makefile#6 integrate
.. //depot/projects/tty/usr.sbin/mountd/mountd.c#12 integrate
.. //depot/projects/tty/usr.sbin/ngctl/config.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/connect.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/debug.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/dot.c#2 integrate
.. //depot/projects/tty/usr.sbin/ngctl/list.c#5 integrate
.. //depot/projects/tty/usr.sbin/ngctl/main.c#6 integrate
.. //depot/projects/tty/usr.sbin/ngctl/mkpeer.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/msg.c#4 integrate
.. //depot/projects/tty/usr.sbin/ngctl/name.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/ngctl.h#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/rmhook.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/show.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/shutdown.c#2 integrate
.. //depot/projects/tty/usr.sbin/ngctl/status.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/types.c#3 integrate
.. //depot/projects/tty/usr.sbin/ngctl/write.c#2 integrate
.. //depot/projects/tty/usr.sbin/portsnap/portsnap/portsnap.sh#8 integrate
.. //depot/projects/tty/usr.sbin/rpc.lockd/kern.c#8 integrate
.. //depot/projects/tty/usr.sbin/sysinstall/dist.c#13 integrate
.. //depot/projects/tty/usr.sbin/sysinstall/installUpgrade.c#6 integrate
.. //depot/projects/tty/usr.sbin/wpa/hostapd/driver_freebsd.c#4 integrate
.. //depot/projects/tty/usr.sbin/ypserv/yp_access.c#3 integrate
Differences ...
==== //depot/projects/tty/MAINTAINERS#19 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.131 2006/05/05 20:12:30 rodrigc Exp $
+$FreeBSD: src/MAINTAINERS,v 1.134 2006/06/01 05:06:54 mjacob Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -20,6 +20,7 @@
subsystem login notes
-----------------------------
+kqueue jmg Pre-commit review requested.
mergemaster dougb Prefers to pre-approve commits
libc/posix1e rwatson Pre-commit review requested.
POSIX.1e ACLs rwatson Pre-commit review requested.
@@ -41,9 +42,10 @@
cdboot jhb Pre-commit review requested.
pxeboot jhb Pre-commit review requested.
witness jhb Pre-commit review requested.
-twe vkashyap Pre-commit review requested
-twa vkashyap Pre-commit review requested
-aac scottl Pre-commit review requested
+twe aradford at amcc.com Pre-commit review requested
+twa aradford at amcc.com Pre-commit review requested
+busdma scottl Pre-commit review requested.
+aac scottl Pre-commit review requested.
udf scottl Pre-commit review requested.
ips scottl Pre-commit review requested.
iir scottl Pre-commit review requested.
==== //depot/projects/tty/Makefile#17 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.329 2006/05/11 18:54:16 jhb Exp $
+# $FreeBSD: src/Makefile,v 1.330 2006/05/26 18:10:06 netchild Exp $
#
# The user-driven targets are:
#
@@ -15,6 +15,7 @@
# reinstallkernel - Reinstall the kernel and the kernel-modules.
# reinstallkernel.debug
# kernel - buildkernel + installkernel.
+# doxygen - Build API documentation of the kernel, needs doxygen.
# update - Convenient way to update your source tree (cvs).
# check-old - Print a list of old files/directories in the system.
# delete-old - Delete obsolete files and directories interactively.
@@ -69,10 +70,10 @@
#
TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \
clean cleandepend cleandir delete-old delete-old-libs depend \
- distribute distributeworld distrib-dirs distribution everything \
- hierarchy install installcheck installkernel installkernel.debug\
- reinstallkernel reinstallkernel.debug installworld \
- kernel-toolchain libraries lint maninstall \
+ distribute distributeworld distrib-dirs distribution doxygen \
+ everything hierarchy install installcheck installkernel \
+ installkernel.debug reinstallkernel reinstallkernel.debug \
+ installworld kernel-toolchain libraries lint maninstall \
obj objlink regress rerelease showconfig tags toolchain update \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
==== //depot/projects/tty/Makefile.inc1#29 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.546 2006/05/17 09:33:05 phk Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -17,6 +17,7 @@
# The intended user-driven targets are:
# buildworld - rebuild *everything*, including glue to help do upgrades
# installworld- install everything built by "buildworld"
+# doxygen - build API documentation of the kernel
# update - convenient way to update your source tree (eg: cvsup/cvs)
#
# Standard targets (not defined here) are documented in the makefiles in
@@ -711,6 +712,18 @@
${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
#
+# doxygen
+#
+# Build the API documentation with doxygen
+#
+doxygen:
+ @if [ ! -x `/usr/bin/which doxygen` ]; then \
+ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
+ exit 1; \
+ fi
+ cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all
+
+#
# update
#
# Update the source tree, by running cvsup and/or running cvs to update to the
==== //depot/projects/tty/ObsoleteFiles.inc#6 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.36 2006/05/17 09:33:05 phk Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.37 2006/05/20 00:30:06 marcel Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -75,6 +75,8 @@
OLD_FILES+=sbin/ip6fw
OLD_FILES+=usr/include/netinet6/ip6_fw.h
OLD_FILES+=usr/share/man/man8/ip6fw.8.gz
+# 20060424: sab(4) removed
+OLD_FILES+=usr/share/man/man4/sab.4.gz
# 20060328: remove redundant rc.d script
OLD_FILES+=etc/rc.d/ike
# 20060127: revert libdisk to static-only
==== //depot/projects/tty/contrib/bsnmp/NEWS#9 (text+ko) ====
@@ -1,3 +1,7 @@
+1.12a
+ Support for ENUM and BITS in gensnmp{tree,def}. Include directives
+ and typedefs.
+
1.12
A couple of man page fixes from various submitters.
==== //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.1#5 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (C) 2004-2005
+.\" Copyright (C) 2004-2006
.\" Hartmut Brandt.
.\" All rights reserved.
.\"
@@ -26,9 +26,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Begemot: bsnmp/gensnmpdef/gensnmpdef.1,v 1.5 2005/10/04 08:46:46 brandt_h Exp $
+.\" $Begemot: gensnmpdef.1 383 2006-05-30 07:40:49Z brandt_h $
.\"
-.Dd June 14, 2005
+.Dd May 28, 2006
.Dt GENSNMPDEF 1
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Nd "generate a MIB description file from MIBs"
.Sh SYNOPSIS
.Nm
-.Op Fl h
+.Op Fl hEe
.Op Fl c Ar cut
.Ar name Op Ar ...
.Sh DESCRIPTION
@@ -48,13 +48,28 @@
for feeding it into
.Xr gensnmptree 1 .
.Pp
-The
-.Fl c
-option specifies the number of initial sub-oids that should be omitted
-from the tree.
+The following options are available:
+.Bl -tag -width indent
+.It Fl c Ar cut
+Specify the number of initial sub-oids that should be omitted
+from the tree in the output.
.Xr gensnmptree 1
automatically adds 1.3.6 in front of all OIDs so the default value
of 3 is just correct in most cases.
+.It Fl E
+Generate typedefs for named enumerations.
+These are enumerations defined via the TEXTUAL-CONVENTION macro.
+The normal tree output is suppressed.
+.It Fl e
+Generate typedefs for unnamed enumerations.
+These are enumerations defined in the SYNTAX clause of an OBJECT-TYPE macro.
+The name of the enumeration is formed by appending the string
+.Ql Type
+to the name of the object.
+The normal tree output is suppressed.
+.It Fl h
+Print a short help text and exit.
+.El
.Pp
.Nm
does no attempt on sorting the OID tree so in case of complex and
==== //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.c#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004
+ * Copyright (C) 2004-2006
* Hartmut Brandt.
* All rights reserved.
*
@@ -26,8 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Begemot: bsnmp/gensnmpdef/gensnmpdef.c,v 1.3 2004/08/06 08:46:45 brandt Exp $
+ * $Begemot: gensnmpdef.c 383 2006-05-30 07:40:49Z brandt_h $
*/
+#include <sys/queue.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -38,9 +40,13 @@
#include <smi.h>
static const char usgtxt[] =
-"Usage: gensnmpdef [-h] [-c <cut>] MIB [MIB ...]\n"
+"Usage: gensnmpdef [-hEe] [-c <cut>] MIB [MIB ...]\n"
"Options:\n"
" -c specify the number of initial sub-oids to cut from the oids\n"
+" -E extract named enum types. Print a typedef for all enums defined\n"
+" in syntax clauses of normal objects. Suppress normal output.\n"
+" -e extract unnamed enum types. Print a typedef for all enums defined\n"
+" as textual conventions. Suppress normal output.\n"
" -h print this help\n"
"MIBs are searched according to the libsmi(3) search rules and can\n"
"be specified either by path or module name\n";
@@ -48,6 +54,14 @@
static SmiNode *last_node;
static u_int cut = 3;
+struct tdef {
+ char *name;
+ SLIST_ENTRY(tdef) link;
+};
+
+static SLIST_HEAD(, tdef) tdefs = SLIST_HEAD_INITIALIZER(tdef);
+static int do_typedef = 0;
+
static void print_node(SmiNode *n, u_int level);
static void
@@ -135,7 +149,7 @@
[SMI_BASETYPE_FLOAT32] = "FLOAT32",
[SMI_BASETYPE_FLOAT64] = "FLOAT64",
[SMI_BASETYPE_FLOAT128] = "FLOAT128",
- [SMI_BASETYPE_ENUM] = "INTEGER",
+ [SMI_BASETYPE_ENUM] = "ENUM",
[SMI_BASETYPE_BITS] = "BITS",
};
@@ -152,6 +166,18 @@
};
static void
+print_enum(SmiType *t)
+{
+ SmiNamedNumber *nnum;
+
+ printf(" (");
+ for (nnum = smiGetFirstNamedNumber(t); nnum != NULL;
+ nnum = smiGetNextNamedNumber(nnum))
+ printf(" %ld %s", nnum->value.value.integer32, nnum->name);
+ printf(" )");
+}
+
+static void
print_type(SmiNode *n)
{
SmiType *type;
@@ -168,6 +194,14 @@
}
}
printf("%s", type_names[type->basetype]);
+
+ if (type->basetype == SMI_BASETYPE_ENUM ||
+ type->basetype == SMI_BASETYPE_BITS)
+ print_enum(type);
+
+ else if (type->basetype == SMI_BASETYPE_OCTETSTRING &&
+ type->name != NULL)
+ printf(" | %s", type->name);
}
static void
@@ -359,6 +393,111 @@
printf(")\n");
}
+static void
+save_typdef(char *name)
+{
+ struct tdef *t;
+ t = malloc(sizeof(struct tdef));
+
+ if (t == NULL)
+ err(1, NULL);
+
+ memset(t, 0 , sizeof(struct tdef));
+ t->name = name;
+ SLIST_INSERT_HEAD(&tdefs, t, link);
+}
+
+static void
+tdefs_cleanup(void)
+{
+ struct tdef *t;
+
+ while ((t = SLIST_FIRST(&tdefs)) != NULL) {
+ SLIST_REMOVE_HEAD(&tdefs, link);
+ free(t);
+ }
+}
+
+static void
+print_enum_typedef(SmiType *t)
+{
+ SmiNamedNumber *nnum;
+
+ for (nnum = smiGetFirstNamedNumber(t); nnum != NULL;
+ nnum = smiGetNextNamedNumber(nnum)) {
+ printf("\t%ld %s\n" , nnum->value.value.integer32, nnum->name);
+ }
+}
+
+static void
+print_stype(SmiNode *n)
+{
+ SmiType *type;
+ struct tdef *t = NULL;
+
+ type = smiGetNodeType(n);
+ assert(type != NULL);
+
+ if (type->basetype == SMI_BASETYPE_ENUM) {
+ if (do_typedef == 'e' && type->name != NULL) {
+ SLIST_FOREACH(t, &tdefs, link) {
+ if (strcmp(t->name, type->name) == 0)
+ return;
+ }
+ save_typdef(type->name);
+ printf("typedef %s ENUM (\n", type->name);
+ } else if (do_typedef == 'E' && type->name == NULL)
+ printf("typedef %sType ENUM (\n", n->name);
+ else
+ return;
+
+ print_enum_typedef(type);
+ printf(")\n\n");
+
+ } else if (type->basetype == SMI_BASETYPE_BITS) {
+ if (do_typedef == 'e' && type->name != NULL) {
+ SLIST_FOREACH(t, &tdefs, link) {
+ if (strcmp(t->name, type->name) == 0)
+ return;
+ }
+ save_typdef(type->name);
+ printf("typedef %s BITS (\n", type->name);
+ } else if (do_typedef == 'E' && type->name == NULL)
+ printf("typedef %sType BITS (\n", n->name);
+ else
+ return;
+
+ print_enum_typedef(type);
+ printf(")\n\n");
+ }
+}
+
+static void
+print_typdefs(SmiNode *n)
+{
+ SmiNode *p;
+
+ p = n;
+ n = smiGetFirstChildNode(n);
+ while (n != NULL) {
+ switch (n->nodekind) {
+ case SMI_NODEKIND_SCALAR:
+ case SMI_NODEKIND_COLUMN:
+ print_stype(n);
+ break;
+ case SMI_NODEKIND_COMPLIANCE:
+ case SMI_NODEKIND_GROUP:
+ save_node(n);
+ return;
+ default:
+ break;
+ }
+ n = smiGetNextChildNode(n);
+ }
+
+ save_node(p);
+}
+
int
main(int argc, char *argv[])
{
@@ -373,7 +512,7 @@
smiInit(NULL);
- while ((opt = getopt(argc, argv, "c:h")) != -1)
+ while ((opt = getopt(argc, argv, "c:Eeh")) != -1)
switch (opt) {
case 'c':
@@ -388,6 +527,14 @@
cut = (u_int)u;
break;
+ case 'E':
+ do_typedef = 'E';
+ break;
+
+ case 'e':
+ do_typedef = 'e';
+ break;
+
case 'h':
fprintf(stderr, usgtxt);
exit(0);
@@ -414,9 +561,12 @@
for (opt = 0; opt < argc; opt++) {
n = smiGetFirstNode(mods[opt], SMI_NODEKIND_ANY);
for (;;) {
- level = open_node(n, level, &last);
- print_it(n, level);
- last = n;
+ if (do_typedef == 0) {
+ level = open_node(n, level, &last);
+ print_it(n, level);
+ last = n;
+ } else
+ print_typdefs(n);
if (last_node == NULL ||
(n = smiGetNextNode(last_node, SMI_NODEKIND_ANY))
@@ -424,6 +574,10 @@
break;
}
}
- level = close_node(last->oidlen - 1, level - 1);
+ if (last != NULL && do_typedef == 0)
+ level = close_node(last->oidlen - 1, level - 1);
+ else if (do_typedef != 0)
+ tdefs_cleanup();
+
return (0);
}
==== //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.1#7 (text+ko) ====
@@ -2,6 +2,9 @@
.\" Copyright (c) 2001-2005
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
+.\" Copyright (c) 2006
+.\" Hartmut Brandt
+.\" All rights reserved.
.\"
.\" Author: Harti Brandt <harti at freebsd.org>
.\"
@@ -26,9 +29,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $
+.\" $Begemot: gensnmptree.1 383 2006-05-30 07:40:49Z brandt_h $
.\"
-.Dd February 27, 2006
+.Dd May 26, 2006
.Dt GENSNMPTREE 1
.Os
.Sh NAME
@@ -36,7 +39,9 @@
.Nd "generate C and header files from a MIB description file"
.Sh SYNOPSIS
.Nm
-.Op Fl helt
+.Op Fl dEehlt
+.Op Fl I Ar directory
+.Op Fl i Ar infile
.Op Fl p Ar prefix
.Op Ar name Ar ...
.Sh DESCRIPTION
@@ -49,9 +54,12 @@
daemon or for module writers.
The second form may be used by SNMP client program writers.
.Pp
-If the
-.Fl e
-option is not used
+If none of the options
+.Fl e ,
+.Fl E
+or
+.FL t
+are used
.Nm
reads a MIB description from its standard input and creates two files: a
C-file
@@ -61,12 +69,20 @@
during PDU processing
and a header file
.Ar prefix Ns tree.h
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list