PERFORCE change 54965 for review
Peter Wemm
peter at FreeBSD.org
Mon Jun 14 23:01:24 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=54965
Change 54965 by peter at peter_daintree on 2004/06/14 23:00:22
IFC @54959
Affected files ...
.. //depot/projects/hammer/UPDATING#40 integrate
.. //depot/projects/hammer/bin/setfacl/Makefile#2 integrate
.. //depot/projects/hammer/contrib/groff/doc/meintro.me#2 integrate
.. //depot/projects/hammer/contrib/groff/doc/meref.me#2 integrate
.. //depot/projects/hammer/etc/etc.arm/ttys#1 branch
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#19 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#11 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd-alpha.h#1 branch
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd-i386.h#1 branch
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd-sparc64.h#1 branch
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#16 integrate
.. //depot/projects/hammer/include/Makefile#23 integrate
.. //depot/projects/hammer/lib/libc/gmon/moncontrol.3#3 integrate
.. //depot/projects/hammer/lib/libc/net/inet.3#3 integrate
.. //depot/projects/hammer/lib/libc/stdtime/asctime.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdtime/difftime.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdtime/localtime.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdtime/private.h#2 integrate
.. //depot/projects/hammer/lib/libc/stdtime/strftime.c#3 integrate
.. //depot/projects/hammer/lib/libc/sys/getrlimit.2#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#14 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#25 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#20 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#11 integrate
.. //depot/projects/hammer/lib/libradius/radlib.c#3 integrate
.. //depot/projects/hammer/lib/msun/amd64/fenv.c#2 integrate
.. //depot/projects/hammer/lib/msun/ia64/fenv.c#2 integrate
.. //depot/projects/hammer/lib/msun/man/ieee_test.3#2 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.c#14 integrate
.. //depot/projects/hammer/sbin/fdisk/fdisk.c#12 integrate
.. //depot/projects/hammer/sbin/gvinum/Makefile#1 branch
.. //depot/projects/hammer/sbin/gvinum/gvinum.c#1 branch
.. //depot/projects/hammer/sbin/gvinum/gvinum.h#1 branch
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#15 integrate
.. //depot/projects/hammer/sbin/md5/Makefile#3 integrate
.. //depot/projects/hammer/sbin/md5/md5.1#4 integrate
.. //depot/projects/hammer/sbin/md5/md5.c#5 integrate
.. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#8 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#40 integrate
.. //depot/projects/hammer/share/man/man4/bge.4#9 integrate
.. //depot/projects/hammer/share/man/man4/ciss.4#4 integrate
.. //depot/projects/hammer/share/man/man4/cue.4#5 integrate
.. //depot/projects/hammer/share/man/man4/dc.4#9 integrate
.. //depot/projects/hammer/share/man/man4/fwip.4#1 branch
.. //depot/projects/hammer/share/man/man4/gx.4#4 integrate
.. //depot/projects/hammer/share/man/man4/kue.4#5 integrate
.. //depot/projects/hammer/share/man/man4/lge.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_rfc1490.4#3 integrate
.. //depot/projects/hammer/share/man/man4/nge.4#3 integrate
.. //depot/projects/hammer/share/man/man4/uftdi.4#2 integrate
.. //depot/projects/hammer/share/man/man7/hier.7#16 integrate
.. //depot/projects/hammer/share/man/man9/sema.9#2 integrate
.. //depot/projects/hammer/share/man/man9/style.9#13 integrate
.. //depot/projects/hammer/share/misc/iso3166#5 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#23 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#24 integrate
.. //depot/projects/hammer/sys/alpha/alpha/uma_machdep.c#1 branch
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#90 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#79 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#44 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#37 integrate
.. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#3 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#15 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#6 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#19 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#6 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#9 integrate
.. //depot/projects/hammer/sys/conf/NOTES#47 integrate
.. //depot/projects/hammer/sys/conf/files#62 integrate
.. //depot/projects/hammer/sys/conf/files.alpha#14 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#25 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#29 integrate
.. //depot/projects/hammer/sys/conf/options#40 integrate
.. //depot/projects/hammer/sys/contrib/altq/altq/altq.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_cbq.c#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_cbq.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_cdnr.c#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_cdnr.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_classq.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_hfsc.c#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_hfsc.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_priq.c#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_priq.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_red.c#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_red.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_rio.c#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_rio.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_rmclass.c#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_rmclass.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_subr.c#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altq_var.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/altqconf.h#1 branch
.. //depot/projects/hammer/sys/contrib/altq/altq/if_altq.h#1 branch
.. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#6 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#6 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#7 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#7 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#3 integrate
.. //depot/projects/hammer/sys/crypto/des/des_ecb.c#2 integrate
.. //depot/projects/hammer/sys/crypto/des/des_enc.c#2 integrate
.. //depot/projects/hammer/sys/crypto/des/des_setkey.c#2 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_debug.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#35 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_button.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#21 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_isab.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_lid.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#14 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#10 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#27 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#16 integrate
.. //depot/projects/hammer/sys/dev/awi/awi.c#11 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_mem.c#4 integrate
.. //depot/projects/hammer/sys/dev/cy/cy.c#5 integrate
.. //depot/projects/hammer/sys/dev/digi/digi.c#9 integrate
.. //depot/projects/hammer/sys/dev/drm/drm.h#6 integrate
.. //depot/projects/hammer/sys/dev/drm/drmP.h#8 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_drv.h#14 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#12 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_sarea.h#3 integrate
.. //depot/projects/hammer/sys/dev/drm/mga.h#5 integrate
.. //depot/projects/hammer/sys/dev/drm/mga_drm.h#3 integrate
.. //depot/projects/hammer/sys/dev/drm/r128.h#6 integrate
.. //depot/projects/hammer/sys/dev/drm/r128_drm.h#4 integrate
.. //depot/projects/hammer/sys/dev/drm/r128_state.c#7 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon.h#8 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#6 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#7 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_mem.c#4 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_state.c#7 integrate
.. //depot/projects/hammer/sys/dev/drm/sis.h#3 integrate
.. //depot/projects/hammer/sys/dev/drm/sis_drv.c#3 integrate
.. //depot/projects/hammer/sys/dev/drm/sis_mm.c#4 integrate
.. //depot/projects/hammer/sys/dev/drm/tdfx.h#4 integrate
.. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#2 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#2 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9xvar.h#2 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#27 integrate
.. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#1 branch
.. //depot/projects/hammer/sys/dev/firewire/if_fwipvar.h#1 branch
.. //depot/projects/hammer/sys/dev/hme/if_hme.c#13 integrate
.. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#4 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_commands.c#11 integrate
.. //depot/projects/hammer/sys/dev/pdq/pdq_freebsd.h#5 integrate
.. //depot/projects/hammer/sys/dev/rp/rp.c#10 integrate
.. //depot/projects/hammer/sys/dev/si/si.c#8 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#33 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#11 integrate
.. //depot/projects/hammer/sys/dev/sx/sx.c#4 integrate
.. //depot/projects/hammer/sys/dev/twe/twe.c#9 integrate
.. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#12 integrate
.. //depot/projects/hammer/sys/dev/twe/twevar.h#7 integrate
.. //depot/projects/hammer/sys/dev/usb/if_udav.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/ucom.c#13 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#28 integrate
.. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#18 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_list.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.h#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_share.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_share.h#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_volume.c#1 branch
.. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#3 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_toshiba.c#7 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#42 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#34 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#34 integrate
.. //depot/projects/hammer/sys/i386/include/pmap.h#13 integrate
.. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#8 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#36 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#24 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/hammer/sys/kern/kern_prot.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_sema.c#3 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#42 integrate
.. //depot/projects/hammer/sys/kern/kern_sysctl.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#52 integrate
.. //depot/projects/hammer/sys/kern/kern_xxx.c#6 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#29 integrate
.. //depot/projects/hammer/sys/kern/sys_socket.c#10 integrate
.. //depot/projects/hammer/sys/kern/tty.c#16 integrate
.. //depot/projects/hammer/sys/kern/tty_compat.c#5 integrate
.. //depot/projects/hammer/sys/kern/tty_conf.c#5 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#14 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#19 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#25 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#19 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#27 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#15 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#39 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#29 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_vinum/Makefile#1 branch
.. //depot/projects/hammer/sys/net/bpf.c#17 integrate
.. //depot/projects/hammer/sys/net/firewire.h#1 branch
.. //depot/projects/hammer/sys/net/if.c#19 integrate
.. //depot/projects/hammer/sys/net/if_arp.h#5 integrate
.. //depot/projects/hammer/sys/net/if_fwsubr.c#1 branch
.. //depot/projects/hammer/sys/net/if_ppp.c#13 integrate
.. //depot/projects/hammer/sys/net/if_sl.c#11 integrate
.. //depot/projects/hammer/sys/net/if_spppsubr.c#12 integrate
.. //depot/projects/hammer/sys/net/if_var.h#16 integrate
.. //depot/projects/hammer/sys/net/raw_cb.c#5 integrate
.. //depot/projects/hammer/sys/net/raw_usrreq.c#8 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_input.c#10 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_input.c#6 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_output.c#7 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#3 integrate
.. //depot/projects/hammer/sys/netatm/atm_aal5.c#4 integrate
.. //depot/projects/hammer/sys/netatm/atm_socket.c#7 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#12 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#10 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#10 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#8 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#10 integrate
.. //depot/projects/hammer/sys/netgraph/ng_rfc1490.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_rfc1490.h#4 integrate
.. //depot/projects/hammer/sys/netinet/accf_http.c#3 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#13 integrate
.. //depot/projects/hammer/sys/netinet/igmp.c#7 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#25 integrate
.. //depot/projects/hammer/sys/netinet/ip_divert.c#16 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#30 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#30 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#30 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#25 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#21 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#16 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#14 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#15 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_input.c#14 integrate
.. //depot/projects/hammer/sys/netipx/ipx_pcb.c#4 integrate
.. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#5 integrate
.. //depot/projects/hammer/sys/netipx/spx_usrreq.c#7 integrate
.. //depot/projects/hammer/sys/netnatm/natm.c#11 integrate
.. //depot/projects/hammer/sys/netsmb/smb_trantcp.c#6 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#28 integrate
.. //depot/projects/hammer/sys/pc98/pc98/pc98gdc.c#9 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#22 integrate
.. //depot/projects/hammer/sys/pci/if_mn.c#9 integrate
.. //depot/projects/hammer/sys/security/mac/mac_socket.c#2 integrate
.. //depot/projects/hammer/sys/sys/_types.h#8 integrate
.. //depot/projects/hammer/sys/sys/gmon.h#4 integrate
.. //depot/projects/hammer/sys/sys/ioctl.h#4 integrate
.. //depot/projects/hammer/sys/sys/param.h#33 integrate
.. //depot/projects/hammer/sys/sys/resource.h#6 integrate
.. //depot/projects/hammer/sys/sys/signal.h#8 integrate
.. //depot/projects/hammer/sys/sys/socketvar.h#16 integrate
.. //depot/projects/hammer/sys/sys/types.h#15 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#24 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/test-fenv.c#1 branch
.. //depot/projects/hammer/tools/tools/kttcp/sys/kttcp.c#2 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/etc/Makefile#6 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/etc/update_current.rc#1 branch
.. //depot/projects/hammer/tools/tools/tinderbox/etc/update_stable.rc#1 branch
.. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#9 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#20 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#9 integrate
.. //depot/projects/hammer/usr.bin/Makefile#32 integrate
.. //depot/projects/hammer/usr.bin/fstat/fstat.c#7 integrate
.. //depot/projects/hammer/usr.bin/su/su.c#13 integrate
.. //depot/projects/hammer/usr.bin/talk/get_names.c#2 integrate
.. //depot/projects/hammer/usr.bin/talk/talk.1#3 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.1#7 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.c#10 integrate
.. //depot/projects/hammer/usr.bin/truss/amd64-fbsd.c#1 branch
.. //depot/projects/hammer/usr.bin/truss/extern.h#5 integrate
.. //depot/projects/hammer/usr.bin/truss/main.c#7 integrate
.. //depot/projects/hammer/usr.bin/truss/syscalls.c#11 integrate
.. //depot/projects/hammer/usr.bin/whois/whois.1#4 integrate
.. //depot/projects/hammer/usr.bin/whois/whois.c#8 integrate
.. //depot/projects/hammer/usr.bin/xinstall/install.1#4 integrate
.. //depot/projects/hammer/usr.sbin/acpi/iasl/iasl.8#2 integrate
.. //depot/projects/hammer/usr.sbin/adduser/adduser.conf.5#3 integrate
.. //depot/projects/hammer/usr.sbin/apm/apm.c#7 integrate
.. //depot/projects/hammer/usr.sbin/arlcontrol/arlcontrol.8#3 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.c#7 integrate
.. //depot/projects/hammer/usr.sbin/asf/asf.8#4 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sdpd.8#2 integrate
.. //depot/projects/hammer/usr.sbin/dconschat/dconschat.8#4 integrate
.. //depot/projects/hammer/usr.sbin/ip6addrctl/ip6addrctl.8#2 integrate
.. //depot/projects/hammer/usr.sbin/moused/moused.8#5 integrate
.. //depot/projects/hammer/usr.sbin/mtree/specspec.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.8#3 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#14 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate
.. //depot/projects/hammer/usr.sbin/nologin/nologin.5#2 integrate
.. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.c#7 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdog.8#3 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.8#4 integrate
.. //depot/projects/hammer/usr.sbin/zzz/zzz.8#3 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#40 (text+ko) ====
@@ -17,7 +17,19 @@
developers choose to disable these features on build machines
to maximize performance.
-20040607:
+20040614:
+ The return value of sema_timedwait(9) has been changed to
+ make it consistent with cv_timedwait(9). Be sure to recompile
+ the ips module and any third-party modules which call
+ sema_timedwait.
+
+20040613:
+ ALTQ is now linked to the build. This breaks ABI for struct ifnet.
+ Make sure to recompile modules and any userland that makes use of
+ sizeof(struct ifnet). In order to get the altq headers in place
+ please recompile and reinstall world.
+
+20040607:
Splitting kern_thread.c into 2 files (adding kern_kse.c)
requires that you re-run config after updating your tree.
@@ -1611,4 +1623,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.309 2004/06/07 21:37:40 julian Exp $
+$FreeBSD: src/UPDATING,v 1.312 2004/06/14 18:19:04 jdp Exp $
==== //depot/projects/hammer/bin/setfacl/Makefile#2 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/bin/setfacl/Makefile,v 1.7 2001/12/04 01:57:46 obrien Exp $
+# $FreeBSD: src/bin/setfacl/Makefile,v 1.8 2004/06/13 19:22:53 obrien Exp $
-PROG= setfacl
-SRCS= file.c mask.c merge.c remove.c setfacl.c util.c
+PROG= setfacl
+SRCS= file.c mask.c merge.c remove.c setfacl.c util.c
.include <bsd.prog.mk>
==== //depot/projects/hammer/contrib/groff/doc/meintro.me#2 (text+ko) ====
@@ -2239,8 +2239,5 @@
and the plethora of people who have contributed ideas
and have given support for the project.
.sp 1i
-This document was
-\*G'ed
-on \*(td
-and applies to the version of the \-me macros
+This document applies to the version of the \-me macros
included with \*G version \*(MO.
==== //depot/projects/hammer/contrib/groff/doc/meref.me#2 (text+ko) ====
@@ -195,9 +195,7 @@
(upper or lower case)
or digit.
.pp
-This documentation was \*G'ed
-on \*(td
-and applies to \*G version
+This documentation applies to \*G version
\*(MO
of the \-me macros.
.sh 1 "Paragraphing"
@@ -1822,19 +1820,19 @@
.DE
Today's date,
directly printable.
-The date is of the form \*(td.
+The date is of the form February 15, 2003.
Other forms of the date can be used
by using
.NR (dy
(the day of the month;
-for example, \n(dy),
+for example, 15),
.ST (mo
(as noted above)
or
.NR (mo
(the same,
but as an ordinal number;
-for example, \*(mo is \n(mo),
+for example, February is 2),
.NR (y4
(the current year),
and
==== //depot/projects/hammer/etc/mtree/BSD.include.dist#19 (text+ko) ====
@@ -1,10 +1,12 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.82 2004/05/20 10:29:26 pjd Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.83 2004/06/13 17:29:05 mlaier Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
/set type=dir uname=root gname=wheel mode=0755
.
+ altq
+ ..
arpa
..
bsnmp
==== //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#11 (text+ko) ====
@@ -1,5 +1,5 @@
# ex:ts=8
-# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.79 2004/03/17 07:40:42 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.80 2004/06/11 16:09:38 obrien Exp $
.include "../Makefile.inc0"
@@ -45,7 +45,7 @@
scm-exp.c scm-lang.c scm-valprint.c \
coffread.c dbxread.c dwarfread.c dwarf2read.c elfread.c \
solib.c solib-svr4.c solib-legacy.c
-XSRCS+= freebsd-uthread.c kvm-fbsd.c solib-fbsd-kld.c
+XSRCS+= freebsd-uthread.c kvm-fbsd.c kvm-fbsd-machine.h solib-fbsd-kld.c
SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h
.include "${.CURDIR}/Makefile.${TARGET_ARCH}"
@@ -73,7 +73,7 @@
LDADD+= ${RELTOP}/libiberty/libiberty.a
LDADD+= -lreadline -ltermcap
-CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h
+CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h kvm-fbsd-machine.h
# We do this by grepping through sources. If that turns out to be too slow,
# maybe we could just require every .o file to have an initialization routine
@@ -127,6 +127,9 @@
ln -sf ${GDBDIR}/gdb/config/${GDB_CPU}/${H}.h ${.TARGET}
.endfor
+kvm-fbsd-machine.h:
+ ln -sf ${.CURDIR}/kvm-fbsd-${TARGET_ARCH}.h ${.TARGET}
+
GDB_VERSION= "5.2.1 (FreeBSD)"
gdbversion.c: Makefile
@echo '#include "version.h"' > ${.TARGET}
==== //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#8 (text+ko) ====
@@ -19,7 +19,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.48 2004/05/10 17:45:51 obrien Exp $ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.49 2004/06/11 16:09:38 obrien Exp $");
/*
* This works like "remote" but, you use it like this:
@@ -33,31 +34,27 @@
*/
#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/proc.h>
#include <sys/user.h>
-#include <errno.h>
-#include <signal.h>
+#include <ctype.h>
#include <fcntl.h>
#include <kvm.h>
#include <sys/sysctl.h>
#include <paths.h>
-#include <readline/tilde.h>
-#include <machine/frame.h>
#include "defs.h"
+#include <readline/tilde.h>
#include "gdb_string.h"
#include "frame.h" /* required by inferior.h */
#include "inferior.h"
-#include "symtab.h"
#include "symfile.h"
#include "objfiles.h"
#include "command.h"
#include "bfd.h"
-#include "target.h"
#include "gdbcore.h"
#include "solist.h"
+#include "kvm-fbsd-machine.h"
+
static void
kcore_files_info (struct target_ops *);
@@ -68,10 +65,6 @@
get_kcore_registers (int);
static int
-xfer_mem (CORE_ADDR, char *, int, int, struct mem_attrib *,
- struct target_ops *);
-
-static int
xfer_umem (CORE_ADDR, char *, int, int);
#ifdef SOLIB_ADD
@@ -116,7 +109,7 @@
#define KERNOFF (ksym_kernbase ())
#define INKERNEL(x) ((x) >= KERNOFF)
-CORE_ADDR
+static CORE_ADDR
ksym_lookup(const char *name)
{
struct minimal_symbol *sym;
@@ -190,8 +183,6 @@
static int
set_context (CORE_ADDR addr)
{
- CORE_ADDR procaddr = 0;
-
if (kvread (addr, &cur_pcb))
error ("cannot read pcb at %#x", addr);
@@ -349,253 +340,6 @@
printf_filtered ("No kernel core file now.\n");
}
-#ifdef __alpha__
-
-#include "alpha/tm-alpha.h"
-#ifndef S0_REGNUM
-#define S0_REGNUM (T7_REGNUM+1)
-#endif
-
-fetch_kcore_registers (struct pcb *pcbp)
-{
-
- /* First clear out any garbage. */
- memset (registers, '\0', REGISTER_BYTES);
-
- /* SP */
- *(long *) ®isters[REGISTER_BYTE (SP_REGNUM)] =
- pcbp->pcb_hw.apcb_ksp;
-
- /* S0 through S6 */
- memcpy (®isters[REGISTER_BYTE (S0_REGNUM)],
- &pcbp->pcb_context[0], 7 * sizeof (long));
-
- /* PC */
- *(long *) ®isters[REGISTER_BYTE (PC_REGNUM)] =
- pcbp->pcb_context[7];
-
- registers_fetched ();
-}
-
-
-CORE_ADDR
-fbsd_kern_frame_saved_pc (struct frame_info *fi)
-{
- struct minimal_symbol *sym;
- CORE_ADDR this_saved_pc;
-
- this_saved_pc = alpha_frame_saved_pc (fi);
-
- sym = lookup_minimal_symbol_by_pc (this_saved_pc);
-
- if (sym != NULL &&
- (strcmp (SYMBOL_NAME (sym), "XentArith") == 0 ||
- strcmp (SYMBOL_NAME (sym), "XentIF") == 0 ||
- strcmp (SYMBOL_NAME (sym), "XentInt") == 0 ||
- strcmp (SYMBOL_NAME (sym), "XentMM") == 0 ||
- strcmp (SYMBOL_NAME (sym), "XentSys") == 0 ||
- strcmp (SYMBOL_NAME (sym), "XentUna") == 0 ||
- strcmp (SYMBOL_NAME (sym), "XentRestart") == 0))
- {
- return (read_memory_integer (fi->frame + 32 * 8, 8));
- }
- else
- {
- return (this_saved_pc);
- }
-}
-
-#endif /* __alpha__ */
-
-#ifdef __i386__
-
-static CORE_ADDR
-ksym_maxuseraddr (void)
-{
- static CORE_ADDR maxuseraddr;
- struct minimal_symbol *sym;
-
- if (maxuseraddr == 0)
- {
- sym = lookup_minimal_symbol ("PTmap", NULL, NULL);
- if (sym == NULL) {
- maxuseraddr = VM_MAXUSER_ADDRESS;
- } else {
- maxuseraddr = SYMBOL_VALUE_ADDRESS (sym);
- }
- }
- return maxuseraddr;
-}
-
-
-/* Symbol names of kernel entry points. Use special frames. */
-#define KSYM_TRAP "calltrap"
-#define KSYM_INTR "Xintr"
-#define KSYM_FASTINTR "Xfastintr"
-#define KSYM_OLDSYSCALL "Xlcall_syscall"
-#define KSYM_SYSCALL "Xint0x80_syscall"
-
-/* The following is FreeBSD-specific hackery to decode special frames
- and elide the assembly-language stub. This could be made faster by
- defining a frame_type field in the machine-dependent frame information,
- but we don't think that's too important right now. */
-enum frametype { tf_normal, tf_trap, tf_interrupt, tf_syscall };
-
-CORE_ADDR
-fbsd_kern_frame_saved_pc (struct frame_info *fi)
-{
- struct minimal_symbol *sym;
- CORE_ADDR this_saved_pc;
- enum frametype frametype;
-
- this_saved_pc = read_memory_integer (fi->frame + 4, 4);
- sym = lookup_minimal_symbol_by_pc (this_saved_pc);
- frametype = tf_normal;
- if (sym != NULL)
- {
- if (strcmp (SYMBOL_NAME (sym), KSYM_TRAP) == 0)
- frametype = tf_trap;
- else
- if (strncmp (SYMBOL_NAME (sym), KSYM_INTR,
- strlen (KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym),
- KSYM_FASTINTR, strlen (KSYM_FASTINTR)) == 0)
- frametype = tf_interrupt;
- else
- if (strcmp (SYMBOL_NAME (sym), KSYM_SYSCALL) == 0 ||
- strcmp (SYMBOL_NAME (sym), KSYM_OLDSYSCALL) == 0)
- frametype = tf_syscall;
- }
-
- switch (frametype)
- {
- case tf_normal:
- return (this_saved_pc);
-#define oEIP offsetof (struct trapframe, tf_eip)
-
- case tf_trap:
- return (read_memory_integer (fi->frame + 8 + oEIP, 4));
-
- case tf_interrupt:
- return (read_memory_integer (fi->frame + 12 + oEIP, 4));
-
- case tf_syscall:
- return (read_memory_integer (fi->frame + 8 + oEIP, 4));
-#undef oEIP
- }
-}
-
-static int
-fetch_kcore_registers (struct pcb *pcb)
-{
- int i;
- int noreg;
-
- /* Get the register values out of the sys pcb and store them where
- `read_register' will find them. */
- /*
- * XXX many registers aren't available.
- * XXX for the non-core case, the registers are stale - they are for
- * the last context switch to the debugger.
- * XXX gcc's register numbers aren't all #defined in tm-i386.h.
- */
- noreg = 0;
- for (i = 0; i < 3; ++i) /* eax,ecx,edx */
- supply_register (i, (char *)&noreg);
-
- supply_register (3, (char *) &pcb->pcb_ebx);
- supply_register (SP_REGNUM, (char *) &pcb->pcb_esp);
- supply_register (FP_REGNUM, (char *) &pcb->pcb_ebp);
- supply_register (6, (char *) &pcb->pcb_esi);
- supply_register (7, (char *) &pcb->pcb_edi);
- supply_register (PC_REGNUM, (char *) &pcb->pcb_eip);
-
- for (i = 9; i < 14; ++i) /* eflags, cs, ss, ds, es, fs */
- supply_register (i, (char *) &noreg);
- supply_register (15, (char *) &pcb->pcb_gs);
-
- /* XXX 80387 registers? */
-}
-
-#endif /* __i386__ */
-
-#ifdef __sparc64__
-
-#define SPARC_INTREG_SIZE 8
-
-static void
-fetch_kcore_registers (struct pcb *pcbp)
-{
- static struct frame top;
- CORE_ADDR f_addr;
- int i;
-
- /* Get the register values out of the sys pcb and store them where
- `read_register' will find them. */
- /*
- * XXX many registers aren't available.
- * XXX for the non-core case, the registers are stale - they are for
- * the last context switch to the debugger.
- * XXX do something with the floating-point registers?
- */
- supply_register (SP_REGNUM, (char *)&pcbp->pcb_ufp);
- supply_register (PC_REGNUM, (char *)&pcbp->pcb_pc);
- f_addr = extract_address (&pcbp->pcb_ufp, SPARC_INTREG_SIZE);
- /* Load the previous frame by hand (XXX) and supply it. */
- read_memory (f_addr + SPOFF, (char *)&top, sizeof (top));
- for (i = 0; i < 8; i++)
- supply_register (i + L0_REGNUM, (char *)&top.fr_local[i]);
- for (i = 0; i < 8; i++)
- supply_register (i + I0_REGNUM, (char *)&top.fr_in[i]);
-}
-
-CORE_ADDR
-fbsd_kern_frame_saved_pc (struct frame_info *fi)
-{
- struct minimal_symbol *sym;
- CORE_ADDR frame, pc_addr, pc;
- char *buf;
-
- buf = alloca (MAX_REGISTER_RAW_SIZE);
- /* XXX: duplicates fi->extra_info->bottom. */
- frame = (fi->next != NULL) ? fi->next->frame : read_sp ();
- pc_addr = frame + offsetof (struct frame, fr_in[7]);
-
-#define READ_PC(pc, a, b) do { \
- read_memory (a, b, SPARC_INTREG_SIZE); \
- pc = extract_address (b, SPARC_INTREG_SIZE); \
-} while (0)
-
- READ_PC (pc, pc_addr, buf);
-
- sym = lookup_minimal_symbol_by_pc (pc);
- if (sym != NULL)
- {
- if (strncmp (SYMBOL_NAME (sym), "tl0_", 4) == 0 ||
- strcmp (SYMBOL_NAME (sym), "btext") == 0 ||
- strcmp (SYMBOL_NAME (sym), "mp_startup") == 0 ||
- strcmp (SYMBOL_NAME (sym), "fork_trampoline") == 0)
- {
- /*
- * Ugly kluge: user space addresses aren't separated from kernel
- * ones by range; if encountering a trap from user space, just
- * return a 0 to stop the trace.
- * Do the same for entry points of kernel processes to avoid
- * printing garbage.
- */
- pc = 0;
- }
- if (strncmp (SYMBOL_NAME (sym), "tl1_", 4) == 0)
- {
- pc_addr = fi->frame + sizeof (struct frame) +
- offsetof (struct trapframe, tf_tpc);
- READ_PC (pc, pc_addr, buf);
- }
- }
- return (pc);
-}
-
-#endif /* __sparc64__ */
-
/* Get the registers out of a core file. This is the machine-
independent part. Fetch_core_registers is the machine-dependent
part, typically implemented in the xm-file for each architecture. */
@@ -623,16 +367,7 @@
printf_filtered ("\t`%s'\n", core_file);
}
-/* If mourn is being called in all the right places, this could be say
- `gdb internal error' (since generic_mourn calls breakpoint_init_inferior). */
-
static int
-ignore (CORE_ADDR addr, char *contents)
-{
- return 0;
-}
-
-static int
xfer_kmem (CORE_ADDR memaddr, char *myaddr, int len, int write,
struct mem_attrib *attrib, struct target_ops *target)
{
@@ -651,7 +386,7 @@
n = kvm_read (core_kd, memaddr, myaddr, len) ;
if (n < 0) {
fprintf_unfiltered (gdb_stderr, "can not access 0x%x, %s\n",
- memaddr, kvm_geterr (core_kd));
+ (unsigned)memaddr, kvm_geterr (core_kd));
n = 0;
}
==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#16 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.76 2004/06/10 22:18:33 peter Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.77 2004/06/11 00:35:29 peter Exp $
#
# This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
@@ -187,7 +187,7 @@
.if ${TARGET_ARCH} == "amd64"
TARGET_INC+= ${GCC_CPU}/x86-64.h
TARGET_INC+= ${GCC_CPU}/freebsd64.h
-TARGET_INC+= ${.CURDIR}/freebsd64-fix.h
+TARGET_INC+= freebsd64-fix.h
.endif
TARGET_INC+= defaults.h
==== //depot/projects/hammer/include/Makefile#23 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.213 2004/05/20 10:29:26 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.214 2004/06/13 17:29:05 mlaier Exp $
#
# Doing a "make install" builds /usr/include.
@@ -111,6 +111,9 @@
cd ${.CURDIR}/../sys/dev/bktr; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \
${DESTDIR}${INCLUDEDIR}/dev/bktr
+ cd ${.CURDIR}/../sys/contrib/altq/altq; \
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+ ${DESTDIR}${INCLUDEDIR}/altq
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/netinet
@@ -149,6 +152,11 @@
ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
done
.endfor
+ cd ${.CURDIR}/../sys/contrib/altq/altq; \
+ for h in *.h; do \
+ ln -fs ../../../sys/contrib/altq/altq/$$h \
+ ${DESTDIR}${INCLUDEDIR}/altq; \
+ done
cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
for h in *.h; do \
ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \
==== //depot/projects/hammer/lib/libc/gmon/moncontrol.3#3 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)moncontrol.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.14 2002/12/19 09:40:22 ru Exp $
+.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.15 2004/06/14 18:41:24 bms Exp $
.\"
-.Dd June 4, 1993
+.Dd June 14, 2004
.Dt MONCONTROL 3
.Os
.Sh NAME
@@ -43,6 +43,7 @@
.Lb libc
.Sh SYNOPSIS
.In sys/types.h
+.In sys/gmon.h
.Ft int
.Fn moncontrol "int mode"
.Ft int
==== //depot/projects/hammer/lib/libc/net/inet.3#3 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.25 2002/09/06 11:23:49 tjr Exp $
+.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.27 2004/06/14 14:24:18 bms Exp $
.\"
-.Dd June 17, 1996
+.Dd June 14, 2004
.Dt INET 3
.Os
.Sh NAME
@@ -119,10 +119,17 @@
.Pp
The function
.Fn inet_ntop
-converts an address from network format (usually a
+converts an address
+.Fa *src
+from network format
+(usually a
.Ft struct in_addr
or some other binary form, in network byte order) to presentation format
(suitable for external display purposes).
+The
+.Fa size
+argument specifies the size, in bytes, of the buffer
+.Fa *dst .
It returns NULL if a system error occurs (in which case,
.Va errno
will have been set), or it returns a pointer to the destination string.
@@ -226,6 +233,18 @@
and
.Fn inet_network
for malformed requests.
+.Sh ERRORS
+The
+.Fn inet_ntop
+call fails if:
+.Bl -tag -width Er
+.It Bq Er ENOSPC
+.Fa size
+was not large enough to store the presentation form of the address.
+.It Bq Er EAFNOSUPPORT
+.Fa *src
+was not an AF_INET or AF_INET6 family address.
+.El
.Sh SEE ALSO
.Xr addr2ascii 3 ,
.Xr byteorder 3 ,
==== //depot/projects/hammer/lib/libc/stdtime/asctime.c#3 (text+ko) ====
@@ -1,15 +1,15 @@
/*
** This file is in the public domain, so clarified as of
-** June 5, 1996 by Arthur David Olson (arthur_david_olson at nih.gov).
+** 1996-06-05 by Arthur David Olson (arthur_david_olson at nih.gov).
*/
#include <sys/cdefs.h>
#ifndef lint
#ifndef NOID
-static char elsieid[] __unused = "@(#)asctime.c 7.7";
+static char elsieid[] __unused = "@(#)asctime.c 7.9";
#endif /* !defined NOID */
#endif /* !defined lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.11 2003/02/16 17:29:11 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.12 2004/06/14 10:31:52 stefanf Exp $");
/*LINTLIBRARY*/
@@ -19,24 +19,14 @@
#include "tzfile.h"
/*
-** A la X3J11, with core dump avoidance.
+** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, Second Edition, 1996-07-12.
*/
-
char *
-asctime(timeptr)
+asctime_r(timeptr, buf)
const struct tm * timeptr;
+char * buf;
{
- static char result[3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) +
- 3 + 2 + 1 + 1];
- return(asctime_r(timeptr, result));
-}
-
-char *
-asctime_r(timeptr, result)
-const struct tm * timeptr;
-char *result;
-{
static const char wday_name[][3] = {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list