PERFORCE change 119822 for review
Warner Losh
imp at FreeBSD.org
Mon May 14 05:33:12 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=119822
Change 119822 by imp at imp_paco-paco on 2007/05/14 05:32:25
IFC @119819
Affected files ...
.. //depot/projects/arm/src/Makefile.inc1#26 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#20 integrate
.. //depot/projects/arm/src/UPDATING#15 integrate
.. //depot/projects/arm/src/bin/mv/mv.1#2 integrate
.. //depot/projects/arm/src/contrib/amd/amq/amq.8#2 integrate
.. //depot/projects/arm/src/etc/defaults/periodic.conf#4 integrate
.. //depot/projects/arm/src/etc/periodic/daily/480.status-ntpd#1 branch
.. //depot/projects/arm/src/lib/libc/Makefile#5 integrate
.. //depot/projects/arm/src/lib/libc/amd64/Symbol.map#3 integrate
.. //depot/projects/arm/src/lib/libc/arm/Symbol.map#3 integrate
.. //depot/projects/arm/src/lib/libc/gdtoa/_hdtoa.c#3 integrate
.. //depot/projects/arm/src/lib/libc/gmon/Symbol.map#3 integrate
.. //depot/projects/arm/src/lib/libc/i386/Symbol.map#4 integrate
.. //depot/projects/arm/src/lib/libc/net/Symbol.map#4 integrate
.. //depot/projects/arm/src/lib/libc/net/ether_addr.c#2 integrate
.. //depot/projects/arm/src/lib/libc/net/ethers.3#2 integrate
.. //depot/projects/arm/src/lib/libc/powerpc/Symbol.map#3 integrate
.. //depot/projects/arm/src/lib/libc/sparc64/Symbol.map#3 integrate
.. //depot/projects/arm/src/lib/libc/stdio/vfprintf.c#5 integrate
.. //depot/projects/arm/src/lib/libc_r/Makefile#3 integrate
.. //depot/projects/arm/src/lib/libfetch/http.c#2 integrate
.. //depot/projects/arm/src/lib/libgeom/libgeom.h#3 integrate
.. //depot/projects/arm/src/lib/libipsec/pfkey_dump.c#2 integrate
.. //depot/projects/arm/src/lib/libpthread/Makefile#4 integrate
.. //depot/projects/arm/src/lib/libpthread/pthread.map#3 integrate
.. //depot/projects/arm/src/lib/libpthread/thread/thr_private.h#4 integrate
.. //depot/projects/arm/src/lib/librt/Makefile#3 integrate
.. //depot/projects/arm/src/lib/libthr/Makefile#5 integrate
.. //depot/projects/arm/src/lib/libthr/pthread.map#4 integrate
.. //depot/projects/arm/src/lib/libthr/thread/thr_init.c#9 integrate
.. //depot/projects/arm/src/lib/libthr/thread/thr_mutex.c#7 integrate
.. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#7 integrate
.. //depot/projects/arm/src/lib/libthread_db/Makefile#3 integrate
.. //depot/projects/arm/src/lib/libutil/Makefile#3 integrate
.. //depot/projects/arm/src/lib/libutil/flopen.3#1 branch
.. //depot/projects/arm/src/lib/libutil/flopen.c#1 branch
.. //depot/projects/arm/src/lib/libutil/libutil.h#2 integrate
.. //depot/projects/arm/src/lib/libutil/pidfile.c#2 integrate
.. //depot/projects/arm/src/lib/msun/Makefile#4 integrate
.. //depot/projects/arm/src/libexec/rtld-elf/Makefile#5 integrate
.. //depot/projects/arm/src/libexec/rtld-elf/rtld.1#4 integrate
.. //depot/projects/arm/src/release/Makefile#11 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate
.. //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#7 integrate
.. //depot/projects/arm/src/sbin/dumpfs/dumpfs.8#2 integrate
.. //depot/projects/arm/src/sbin/fdisk/fdisk.c#3 integrate
.. //depot/projects/arm/src/sbin/fdisk_pc98/fdisk.8#4 integrate
.. //depot/projects/arm/src/sbin/geom/class/eli/geom_eli.c#8 integrate
.. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#10 integrate
.. //depot/projects/arm/src/sbin/setkey/setkey.8#3 integrate
.. //depot/projects/arm/src/sbin/setkey/token.l#2 integrate
.. //depot/projects/arm/src/secure/lib/libcrypto/Makefile#5 integrate
.. //depot/projects/arm/src/secure/lib/libcrypto/Makefile.inc#6 integrate
.. //depot/projects/arm/src/secure/lib/libcrypto/opensslconf-amd64.h#4 integrate
.. //depot/projects/arm/src/secure/lib/libcrypto/opensslconf-i386.h#4 integrate
.. //depot/projects/arm/src/share/man/man4/Makefile#12 integrate
.. //depot/projects/arm/src/share/man/man4/altq.4#6 integrate
.. //depot/projects/arm/src/share/man/man4/axe.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/hptiop.4#1 branch
.. //depot/projects/arm/src/share/man/man4/md.4#3 integrate
.. //depot/projects/arm/src/share/man/man4/rum.4#1 branch
.. //depot/projects/arm/src/share/man/man4/snd_atiixp.4#3 integrate
.. //depot/projects/arm/src/share/man/man4/snd_via8233.4#3 integrate
.. //depot/projects/arm/src/share/man/man4/twa.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/ubsa.4#5 integrate
.. //depot/projects/arm/src/share/man/man4/vlan.4#7 integrate
.. //depot/projects/arm/src/share/man/man5/passwd.5#2 integrate
.. //depot/projects/arm/src/share/man/man5/periodic.conf.5#4 integrate
.. //depot/projects/arm/src/share/man/man9/VFS_SYNC.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/VOP_FSYNC.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/g_bio.9#3 integrate
.. //depot/projects/arm/src/share/man/man9/make_dev.9#3 integrate
.. //depot/projects/arm/src/share/mk/bsd.lib.mk#7 integrate
.. //depot/projects/arm/src/share/mk/bsd.libnames.mk#6 integrate
.. //depot/projects/arm/src/share/mk/bsd.own.mk#11 integrate
.. //depot/projects/arm/src/share/mk/bsd.symver.mk#3 integrate
.. //depot/projects/arm/src/share/mklocale/ja_JP.eucJP.src#2 integrate
.. //depot/projects/arm/src/sys/amd64/acpica/madt.c#8 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#12 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#12 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#20 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#16 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/mptable.c#6 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/msi.c#5 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/nexus.c#11 integrate
.. //depot/projects/arm/src/sys/amd64/conf/GENERIC#21 integrate
.. //depot/projects/arm/src/sys/amd64/conf/NOTES#15 integrate
.. //depot/projects/arm/src/sys/amd64/include/apicvar.h#13 integrate
.. //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#11 integrate
.. //depot/projects/arm/src/sys/amd64/isa/atpic.c#7 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#16 integrate
.. //depot/projects/arm/src/sys/boot/common/loader.8#9 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.amd64#4 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.arm#17 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.i386#5 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.ia64#4 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.pc98#5 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.powerpc#4 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.sparc64#4 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.sun4v#2 integrate
.. //depot/projects/arm/src/sys/conf/NOTES#47 integrate
.. //depot/projects/arm/src/sys/conf/files#71 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/arm/src/sys/crypto/camellia/camellia-api.c#1 branch
.. //depot/projects/arm/src/sys/crypto/camellia/camellia.c#1 branch
.. //depot/projects/arm/src/sys/crypto/camellia/camellia.h#1 branch
.. //depot/projects/arm/src/sys/dev/acpica/acpi.c#19 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.c#37 integrate
.. //depot/projects/arm/src/sys/dev/firewire/sbp_targ.c#5 integrate
.. //depot/projects/arm/src/sys/dev/hptiop/hptiop.c#1 branch
.. //depot/projects/arm/src/sys/dev/hptiop/hptiop.h#1 branch
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#28 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#26 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#18 integrate
.. //depot/projects/arm/src/sys/dev/mfi/mfi.c#15 integrate
.. //depot/projects/arm/src/sys/dev/mfi/mfi_disk.c#5 integrate
.. //depot/projects/arm/src/sys/dev/mfi/mfi_ioctl.h#5 integrate
.. //depot/projects/arm/src/sys/dev/mfi/mfi_pci.c#5 integrate
.. //depot/projects/arm/src/sys/dev/mfi/mfivar.h#6 integrate
.. //depot/projects/arm/src/sys/dev/mxge/eth_z8e.dat.gz.uu#5 integrate
.. //depot/projects/arm/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#5 integrate
.. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#15 integrate
.. //depot/projects/arm/src/sys/dev/mxge/mxge_mcp.h#4 integrate
.. //depot/projects/arm/src/sys/dev/nve/if_nve.c#8 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci.c#27 integrate
.. //depot/projects/arm/src/sys/dev/sk/if_sk.c#13 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#13 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.h#7 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl.h#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_externs.h#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_fwif.h#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_fwimg.c#2 delete
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_intr.c#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_ioctl.h#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_misc.c#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_cam.c#5 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_externs.h#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_includes.h#3 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_inline.h#3 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_ioctl.h#2 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_share.h#3 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_types.h#2 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_axe.c#11 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_cue.c#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_cuereg.h#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_kue.c#5 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_kuereg.h#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_rue.c#5 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_ruereg.h#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_rum.c#2 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_udav.c#7 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_ural.c#20 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_uralvar.h#5 integrate
.. //depot/projects/arm/src/sys/dev/usb/ubsa.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/uhid.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/ukbd.c#8 integrate
.. //depot/projects/arm/src/sys/dev/usb/ums.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_mem.c#5 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#14 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#30 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/arm/src/sys/i386/Makefile#2 integrate
.. //depot/projects/arm/src/sys/i386/acpica/madt.c#8 integrate
.. //depot/projects/arm/src/sys/i386/conf/GENERIC#21 integrate
.. //depot/projects/arm/src/sys/i386/conf/NOTES#23 integrate
.. //depot/projects/arm/src/sys/i386/conf/PAE#7 integrate
.. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#12 integrate
.. //depot/projects/arm/src/sys/i386/i386/io_apic.c#11 integrate
.. //depot/projects/arm/src/sys/i386/i386/local_apic.c#19 integrate
.. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#16 integrate
.. //depot/projects/arm/src/sys/i386/i386/mptable.c#5 integrate
.. //depot/projects/arm/src/sys/i386/i386/msi.c#5 integrate
.. //depot/projects/arm/src/sys/i386/i386/nexus.c#11 integrate
.. //depot/projects/arm/src/sys/i386/include/apicvar.h#12 integrate
.. //depot/projects/arm/src/sys/i386/include/intr_machdep.h#11 integrate
.. //depot/projects/arm/src/sys/i386/isa/atpic.c#7 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#14 integrate
.. //depot/projects/arm/src/sys/kern/Make.tags.inc#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_condvar.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_mib.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_mutex.c#16 integrate
.. //depot/projects/arm/src/sys/kern/kern_rwlock.c#10 integrate
.. //depot/projects/arm/src/sys/kern/kern_sx.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_synch.c#20 integrate
.. //depot/projects/arm/src/sys/kern/kern_timeout.c#5 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#36 integrate
.. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#26 integrate
.. //depot/projects/arm/src/sys/modules/Makefile#42 integrate
.. //depot/projects/arm/src/sys/modules/crypto/Makefile#5 integrate
.. //depot/projects/arm/src/sys/modules/em/Makefile#4 integrate
.. //depot/projects/arm/src/sys/modules/hptiop/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/twa/Makefile#4 integrate
.. //depot/projects/arm/src/sys/net/ethernet.h#8 integrate
.. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.c#3 integrate
.. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.h#2 integrate
.. //depot/projects/arm/src/sys/net/if_lagg.c#3 integrate
.. //depot/projects/arm/src/sys/net/if_lagg.h#3 integrate
.. //depot/projects/arm/src/sys/net/pfkeyv2.h#2 integrate
.. //depot/projects/arm/src/sys/netatalk/ddp_usrreq.c#7 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_mppc.c#4 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_socket.c#10 integrate
.. //depot/projects/arm/src/sys/netinet/if_ether.c#17 integrate
.. //depot/projects/arm/src/sys/netinet/in.c#9 integrate
.. //depot/projects/arm/src/sys/netinet/in_cksum.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/in_gif.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.c#20 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.h#11 integrate
.. //depot/projects/arm/src/sys/netinet/in_rmx.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip.h#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip_divert.c#11 integrate
.. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#10 integrate
.. //depot/projects/arm/src/sys/netinet/ip_ecn.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/ip_encap.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#31 integrate
.. //depot/projects/arm/src/sys/netinet/ip_icmp.c#7 integrate
.. //depot/projects/arm/src/sys/netinet/ip_id.c#2 integrate
.. //depot/projects/arm/src/sys/netinet/ip_input.c#18 integrate
.. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip_mroute.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/ip_options.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/ip_options.h#2 integrate
.. //depot/projects/arm/src/sys/netinet/ip_output.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/raw_ip.c#14 integrate
.. //depot/projects/arm/src/sys/netinet/sctp.h#5 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_asconf.h#5 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_auth.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_auth.h#4 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#7 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.h#5 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_constants.h#10 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_crc32.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_crc32.h#3 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_header.h#4 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_indata.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_indata.h#5 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_input.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_input.h#3 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_lock_bsd.h#5 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_os.h#6 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#9 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_output.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_output.h#6 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#8 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_peeloff.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_peeloff.h#3 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_structs.h#12 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_timer.c#9 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_timer.h#3 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_uio.h#11 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_var.h#8 integrate
.. //depot/projects/arm/src/sys/netinet/sctputil.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/sctputil.h#11 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_debug.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_fsm.h#2 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_input.c#29 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_output.c#17 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_reass.c#1 branch
.. //depot/projects/arm/src/sys/netinet/tcp_sack.c#13 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_subr.c#24 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_timer.c#15 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#1 branch
.. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#18 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_var.h#18 integrate
.. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#19 integrate
.. //depot/projects/arm/src/sys/netinet6/esp_camellia.c#1 branch
.. //depot/projects/arm/src/sys/netinet6/esp_camellia.h#1 branch
.. //depot/projects/arm/src/sys/netinet6/esp_core.c#4 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#13 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_pcb.h#4 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_proto.c#8 integrate
.. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#8 integrate
.. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#11 integrate
.. //depot/projects/arm/src/sys/netinet6/sctp6_var.h#4 integrate
.. //depot/projects/arm/src/sys/netipsec/xform_esp.c#7 integrate
.. //depot/projects/arm/src/sys/netipx/ipx.c#3 integrate
.. //depot/projects/arm/src/sys/netipx/ipx.h#4 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_cksum.c#3 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_if.h#3 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_input.c#6 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_outputfl.c#3 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_pcb.c#5 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_pcb.h#4 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_usrreq.c#7 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_var.h#3 integrate
.. //depot/projects/arm/src/sys/netipx/spx_debug.c#3 integrate
.. //depot/projects/arm/src/sys/netipx/spx_debug.h#3 integrate
.. //depot/projects/arm/src/sys/opencrypto/cryptodev.c#9 integrate
.. //depot/projects/arm/src/sys/opencrypto/cryptodev.h#6 integrate
.. //depot/projects/arm/src/sys/opencrypto/cryptosoft.c#8 integrate
.. //depot/projects/arm/src/sys/opencrypto/xform.c#6 integrate
.. //depot/projects/arm/src/sys/opencrypto/xform.h#3 integrate
.. //depot/projects/arm/src/sys/pc98/conf/GENERIC#13 integrate
.. //depot/projects/arm/src/sys/pci/if_tl.c#7 integrate
.. //depot/projects/arm/src/sys/sparc64/include/profile.h#2 integrate
.. //depot/projects/arm/src/sys/sun4v/include/profile.h#2 integrate
.. //depot/projects/arm/src/sys/sys/callout.h#3 integrate
.. //depot/projects/arm/src/sys/sys/param.h#29 integrate
.. //depot/projects/arm/src/sys/sys/rwlock.h#8 integrate
.. //depot/projects/arm/src/sys/sys/sx.h#10 integrate
.. //depot/projects/arm/src/sys/vm/uma_int.h#3 integrate
.. //depot/projects/arm/src/tools/regression/lib/libc/net/Makefile#2 integrate
.. //depot/projects/arm/src/tools/regression/lib/libc/net/test-ether.c#1 branch
.. //depot/projects/arm/src/tools/regression/lib/libc/net/test-ether.t#1 branch
.. //depot/projects/arm/src/tools/regression/sockets/sblock/Makefile#1 branch
.. //depot/projects/arm/src/tools/regression/sockets/sblock/sblock.c#1 branch
.. //depot/projects/arm/src/usr.bin/calendar/calendar.c#2 integrate
.. //depot/projects/arm/src/usr.bin/calendar/calendar.h#2 integrate
.. //depot/projects/arm/src/usr.bin/calendar/day.c#2 integrate
.. //depot/projects/arm/src/usr.bin/calendar/io.c#2 integrate
.. //depot/projects/arm/src/usr.bin/calendar/ostern.c#2 integrate
.. //depot/projects/arm/src/usr.bin/calendar/paskha.c#2 integrate
.. //depot/projects/arm/src/usr.bin/ldd/ldd.1#2 integrate
.. //depot/projects/arm/src/usr.bin/logger/Makefile#3 integrate
.. //depot/projects/arm/src/usr.bin/logger/logger.c#3 integrate
.. //depot/projects/arm/src/usr.bin/login/login.h#3 integrate
.. //depot/projects/arm/src/usr.bin/login/login_audit.c#2 integrate
.. //depot/projects/arm/src/usr.bin/login/login_fbtab.c#2 integrate
.. //depot/projects/arm/src/usr.bin/quota/quota.c#7 integrate
.. //depot/projects/arm/src/usr.bin/tar/read.c#7 integrate
.. //depot/projects/arm/src/usr.bin/time/Makefile#2 integrate
.. //depot/projects/arm/src/usr.bin/time/time.c#2 integrate
.. //depot/projects/arm/src/usr.bin/tip/tip/acu.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#3 integrate
.. //depot/projects/arm/src/usr.sbin/boot0cfg/boot0cfg.8#2 integrate
.. //depot/projects/arm/src/usr.sbin/config/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/config/config.8#4 integrate
.. //depot/projects/arm/src/usr.sbin/config/config.h#6 integrate
.. //depot/projects/arm/src/usr.sbin/config/config.y#8 integrate
.. //depot/projects/arm/src/usr.sbin/config/configvers.h#6 integrate
.. //depot/projects/arm/src/usr.sbin/config/kernconf.tmpl#1 branch
.. //depot/projects/arm/src/usr.sbin/config/lang.l#4 integrate
.. //depot/projects/arm/src/usr.sbin/config/main.c#7 integrate
.. //depot/projects/arm/src/usr.sbin/iostat/iostat.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/mixer/mixer.8#2 integrate
.. //depot/projects/arm/src/usr.sbin/nologin/nologin.5#2 integrate
.. //depot/projects/arm/src/usr.sbin/pccard/pccardc/pccardc.8#2 integrate
Differences ...
==== //depot/projects/arm/src/Makefile.inc1#26 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.574 2007/05/13 18:15:50 des Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1016,7 +1016,7 @@
${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
- lib/libopie lib/libpam lib/libpthread \
+ lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
@@ -1135,18 +1135,14 @@
delete-old-files:
@echo ">>> Removing old files (only deletes safe to delete libs)"
-.for file in ${OLD_FILES}
# Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry.
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- rm ${RM_I} "${DESTDIR}/${file}" || true; \
- if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\
- echo "Removing schg flag on ${DESTDIR}/${file}"; \
- chflags noschg "${DESTDIR}/${file}"; \
- rm ${RM_I} "${DESTDIR}/${file}"; \
+ @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \
+ if [ -f "./$${file}" -o -L "./$${file}" ]; then \
+ chflags noschg "./$${file}" 2>/dev/null || true; \
+ rm ${RM_I} "${DESTDIR}/$${file}" || true; \
fi; \
- fi
-.endfor
+ done)
# Remove catpages without corresponding manpages.
@3<&0; \
find ${DESTDIR}/usr/share/man/cat* ! -type d | \
@@ -1161,11 +1157,11 @@
check-old-files:
@echo ">>> Checking for old files"
-.for file in ${OLD_FILES}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- echo "${DESTDIR}/${file}"; \
- fi
-.endfor
+ @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \
+ if [ -f "./$${file}" -o -L "./$${file}" ]; then \
+ echo "${DESTDIR}/$${file}"; \
+ fi; \
+ done)
# Check for catpages without corresponding manpages.
@find ${DESTDIR}/usr/share/man/cat* ! -type d | \
sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
@@ -1179,25 +1175,21 @@
delete-old-libs:
@echo ">>> Removing old libraries"
@echo "${OLD_LIBS_MESSAGE}" | fmt
-.for file in ${OLD_LIBS}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- rm ${RM_I} "${DESTDIR}/${file}" || true; \
- if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\
- echo "Removing schg flag on ${DESTDIR}/${file}"; \
- chflags noschg "${DESTDIR}/${file}"; \
- rm ${RM_I} "${DESTDIR}/${file}"; \
+ @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \
+ if [ -f "./$${file}" -o -L "./$${file}" ]; then \
+ chflags noschg "./$${file}" 2>/dev/null || true; \
+ rm ${RM_I} "${DESTDIR}/$${file}" || true; \
fi; \
- fi
-.endfor
+ done)
@echo ">>> Old libraries removed"
check-old-libs:
@echo ">>> Checking for old libraries"
-.for file in ${OLD_LIBS}
- @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \
- echo "${DESTDIR}/${file}"; \
- fi
-.endfor
+ @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \
+ if [ -f "./$${file}" -o -L "./$${file}" ]; then \
+ echo "${DESTDIR}/$${file}"; \
+ fi; \
+ done)
delete-old-dirs:
@echo ">>> Removing old directories"
==== //depot/projects/arm/src/ObsoleteFiles.inc#20 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.81 2007/04/24 16:58:54 emax Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.82 2007/05/10 13:25:27 roberto Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20070510: zpool/zfs moved to /sbin
+OLD_FILES+=usr/sbin/zfs
+OLD_FILES+=usr/sbin/zpool
# 20070423: rc.bluetooth (examples) removed
OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
# 20070421: worm.4 removed
==== //depot/projects/arm/src/UPDATING#15 (text+ko) ====
@@ -21,6 +21,19 @@
developers choose to disable these features on build machines
to maximize performance.
+20070513:
+ Symbol versioning is enabled by default. To disable it, use
+ option WITHOUT_SYMVER. It is not advisable to attempt to
+ disable symbol versioning once it is enabled; your installworld
+ will break because a symbol version-less libc will get installed
+ before the install tools. As a result, the old install tools,
+ which previously had symbol dependencies to FBSD_1.0, will fail
+ because the freshly installed libc will not have them.
+
+ The default threading library has been changed to libthr. If
+ you wish to have libpthread as your default, use option
+ DEFAULT_THREAD_LIB=libpthread for the buildworld.
+
20070423:
The ABI breakage in sendmail(8)'s libmilter has been repaired
so it is no longer necessary to recompile mail filters (aka,
@@ -773,4 +786,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $
+$FreeBSD: src/UPDATING,v 1.490 2007/05/13 14:41:48 deischen Exp $
==== //depot/projects/arm/src/bin/mv/mv.1#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mv.1 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/mv/mv.1,v 1.28 2005/01/16 16:41:58 ru Exp $
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $
.\"
.Dd July 9, 2002
.Dt MV 1
@@ -113,9 +113,9 @@
to be verbose, showing files after they are moved.
.El
.Pp
-It is an error for either the
+It is an error for the
.Ar source
-operand or the destination path to specify a directory unless both do.
+operand to specify a directory if the target exists and is not a directory.
.Pp
If the destination path does not have a mode which permits writing,
.Nm
==== //depot/projects/arm/src/contrib/amd/amq/amq.8#2 (text+ko) ====
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.13 2007/05/12 10:25:31 pav Exp $
.\"
.Dd March 16, 1991
.Dt AMQ 8
@@ -133,7 +133,7 @@
Ask the automounter to use the logging options specified in
.Ar log_options
from now on.
-.It Fl D Ar log_options
+.It Fl D Ar debug_options
Ask the automounter to use the debugging options specified in
.Ar debug_options
from now on.
==== //depot/projects/arm/src/etc/defaults/periodic.conf#4 (text+ko) ====
@@ -13,7 +13,7 @@
# For a more detailed explanation of all the periodic.conf variables, please
# refer to the periodic.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.42 2007/04/06 02:33:06 pjd Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.43 2007/05/13 09:33:35 maxim Exp $
#
# What files override these defaults ?
@@ -130,6 +130,9 @@
daily_status_named_enable="YES"
daily_status_named_usedns="YES" # DNS lookups are ok
+# 480.status-ntpd
+daily_status_ntpd_enable="NO" # Check NTP status
+
# 500.queuerun
daily_queuerun_enable="YES" # Run mail queue
daily_submit_queuerun="YES" # Also submit queue
==== //depot/projects/arm/src/lib/libc/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.69 2007/03/04 12:25:03 simon Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.70 2007/05/13 14:12:38 deischen Exp $
SHLIBDIR?= /lib
@@ -76,11 +76,9 @@
CFLAGS+=-D_FREEFALL_CONFIG
.endif
-.if defined(SYMVER_ENABLED)
VERSION_DEF=${.CURDIR}/Versions.def
SYMBOL_MAPS=${SYM_MAPS}
CFLAGS+= -DSYMBOL_VERSIONING
-.endif
# If there are no machine dependent sources, append all the
# machine-independent sources:
==== //depot/projects/arm/src/lib/libc/amd64/Symbol.map#3 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $
+ * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $
*/
/*
@@ -11,6 +11,7 @@
/* PSEUDO syscalls */
_exit;
+ .mcount;
_setjmp;
_longjmp;
fabs;
==== //depot/projects/arm/src/lib/libc/arm/Symbol.map#3 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $
+ * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $
*/
/*
@@ -11,6 +11,7 @@
/* PSEUDO syscalls */
_exit;
+ _mcount;
_setjmp;
_longjmp;
alloca;
@@ -22,7 +23,7 @@
setjmp;
longjmp;
sigsetjmp;
- siglongjmp
+ siglongjmp;
htonl;
__htonl;
htons;
@@ -65,4 +66,26 @@
__sys_fork;
_fork;
_sbrk;
+
+ /* softfloat */
+ __addsf3;
+ __adddf3;
+ __subsf3;
+ __subdf3;
+ __mulsf3;
+ __muldf3;
+ __divsf3;
+ __divdf3;
+ __floatsisf;
+ __floatsidf;
+ __floatdisf;
+ __floatdidf;
+ __fixsfsi;
+ __fixdfsi;
+ __fixsfdi;
+ __fixdfdi;
+ __fixunssfsi;
+ __fixunsdfsi;
+ __extendsfdf2;
+ __truncdfsf2;
};
==== //depot/projects/arm/src/lib/libc/gdtoa/_hdtoa.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.4 2007/01/03 04:57:58 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $");
#include <float.h>
#include <limits.h>
@@ -78,7 +78,7 @@
break;
case 1: /* to nearest, halfway rounds to even */
if ((s0[ndigits] > 8) ||
- (s0[ndigits] == 8 && s0[ndigits - 1] & 1))
+ (s0[ndigits] == 8 && s0[ndigits + 1] & 1))
adjust = roundup(s0, ndigits);
break;
case 2: /* toward +inf */
==== //depot/projects/arm/src/lib/libc/gmon/Symbol.map#3 (text) ====
@@ -1,9 +1,8 @@
/*
- * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.2 2007/04/29 14:05:16 deischen Exp $
+ * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $
*/
FBSD_1.0 {
- .mcount;
_mcleanup;
monstartup;
moncontrol;
==== //depot/projects/arm/src/lib/libc/i386/Symbol.map#4 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.3 2007/04/29 14:05:16 deischen Exp $
+ * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.4 2007/05/13 14:16:55 deischen Exp $
*/
/*
@@ -11,6 +11,7 @@
/* PSEUDO syscalls */
_exit;
+ .mcount;
_setjmp;
_longjmp;
alloca;
==== //depot/projects/arm/src/lib/libc/net/Symbol.map#4 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.8 2007/04/29 14:05:17 deischen Exp $
+ * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.9 2007/05/13 15:01:25 rwatson Exp $
*/
FBSD_1.0 {
@@ -7,7 +7,9 @@
__b64_pton;
ether_line;
ether_aton;
+ ether_aton_r;
ether_ntoa;
+ ether_ntoa_r;
ether_ntohost;
ether_hostton;
eui64_aton;
==== //depot/projects/arm/src/lib/libc/net/ether_addr.c#2 (text+ko) ====
@@ -1,6 +1,7 @@
/*
- * Copyright (c) 1995
- * Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
+ * Copyright (c) 1995 Bill Paul <wpaul at ctr.columbia.edu>.
+ * Copyright (c) 2007 Robert N. M. Watson
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,103 +38,104 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.15 2002/04/08 07:51:10 ru Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.17 2007/05/13 13:57:44 rwatson Exp $");
-#include <stdio.h>
-#include <paths.h>
#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
#include <sys/param.h>
#include <sys/socket.h>
+
#include <net/ethernet.h>
+
#ifdef YP
#include <rpc/rpc.h>
#include <rpcsvc/yp_prot.h>
#include <rpcsvc/ypclnt.h>
#endif
+#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
+#define _PATH_ETHERS "/etc/ethers"
#endif
/*
- * Parse a string of text containing an ethernet address and hostname
- * and separate it into its component parts.
+ * Parse a string of text containing an ethernet address and hostname and
+ * separate it into its component parts.
*/
int
-ether_line(l, e, hostname)
- const char *l;
- struct ether_addr *e;
- char *hostname;
+ether_line(const char *l, struct ether_addr *e, char *hostname)
{
- int i, o[6];
+ int i, o[6];
- i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2],
- &o[3], &o[4], &o[5],
- hostname);
+ i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3],
+ &o[4], &o[5], hostname);
if (i != 7)
- return (i);
-
- for (i=0; i<6; i++)
- e->octet[i] = o[i];
- return (0);
+ return (i);
+ for (i=0; i<6; i++)
+ e->octet[i] = o[i];
+ return (0);
}
/*
- * Convert an ASCII representation of an ethernet address to
- * binary form.
+ * Convert an ASCII representation of an ethernet address to binary form.
*/
-struct
-ether_addr *ether_aton(a)
- const char *a;
+struct ether_addr *
+ether_aton_r(const char *a, struct ether_addr *e)
{
- int i;
- static struct ether_addr o;
+ int i;
unsigned int o0, o1, o2, o3, o4, o5;
- i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
+ i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
+ if (i != 6)
+ return (NULL);
+ e->octet[0]=o0;
+ e->octet[1]=o1;
+ e->octet[2]=o2;
+ e->octet[3]=o3;
+ e->octet[4]=o4;
+ e->octet[5]=o5;
+ return (e);
+}
- if (i != 6)
- return (NULL);
+struct ether_addr *
+ether_aton(const char *a)
+{
+ static struct ether_addr e;
- o.octet[0]=o0;
- o.octet[1]=o1;
- o.octet[2]=o2;
- o.octet[3]=o3;
- o.octet[4]=o4;
- o.octet[5]=o5;
-
- return ((struct ether_addr *)&o);
+ return (ether_aton_r(a, &e));
}
/*
- * Convert a binary representation of an ethernet address to
- * an ASCII string.
+ * Convert a binary representation of an ethernet address to an ASCII string.
*/
-char
-*ether_ntoa(n)
- const struct ether_addr *n;
+char *
+ether_ntoa_r(const struct ether_addr *n, char *a)
+{
+ int i;
+
+ i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0],
+ n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]);
+ if (i < 17)
+ return (NULL);
+ return (a);
+}
+
+char *
+ether_ntoa(const struct ether_addr *n)
{
- int i;
static char a[18];
- i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x",
- n->octet[0], n->octet[1], n->octet[2],
- n->octet[3], n->octet[4], n->octet[5]);
- if (i < 17)
- return (NULL);
- return ((char *)&a);
+ return (ether_ntoa_r(n, a));
}
/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or
- * NIS/YP.
+ * Map an ethernet address to a hostname. Use either /etc/ethers or NIS/YP.
*/
int
-ether_ntohost(hostname, e)
- char *hostname;
- const struct ether_addr *e;
+ether_ntohost(char *hostname, const struct ether_addr *e)
{
FILE *fp;
char buf[BUFSIZ + 2];
@@ -145,9 +147,9 @@
char *ether_a;
char *yp_domain;
#endif
+
if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
return (1);
-
while (fgets(buf,BUFSIZ,fp)) {
if (buf[0] == '#')
continue;
@@ -157,7 +159,7 @@
continue;
ether_a = ether_ntoa(e);
if (yp_match(yp_domain, "ethers.byaddr", ether_a,
- strlen(ether_a), &result, &resultlen)) {
+ strlen(ether_a), &result, &resultlen)) {
continue;
}
strncpy(buf, result, resultlen);
@@ -167,8 +169,8 @@
#endif
if (!ether_line(buf, &local_ether, local_host)) {
if (!bcmp((char *)&local_ether.octet[0],
- (char *)&e->octet[0], 6)) {
- /* We have a match */
+ (char *)&e->octet[0], 6)) {
+ /* We have a match. */
strcpy(hostname, local_host);
fclose(fp);
return(0);
@@ -180,13 +182,10 @@
}
/*
- * Map a hostname to an ethernet address using /etc/ethers or
- * NIS/YP.
+ * Map a hostname to an ethernet address using /etc/ethers or NIS/YP.
*/
int
-ether_hostton(hostname, e)
- const char *hostname;
- struct ether_addr *e;
+ether_hostton(const char *hostname, struct ether_addr *e)
{
FILE *fp;
char buf[BUFSIZ + 2];
@@ -197,9 +196,9 @@
int resultlen;
char *yp_domain;
#endif
+
if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
return (1);
-
while (fgets(buf,BUFSIZ,fp)) {
if (buf[0] == '#')
continue;
@@ -208,7 +207,7 @@
if (yp_get_default_domain(&yp_domain))
continue;
if (yp_match(yp_domain, "ethers.byname", hostname,
- strlen(hostname), &result, &resultlen)) {
+ strlen(hostname), &result, &resultlen)) {
continue;
}
strncpy(buf, result, resultlen);
@@ -218,9 +217,9 @@
#endif
if (!ether_line(buf, &local_ether, local_host)) {
if (!strcmp(hostname, local_host)) {
- /* We have a match */
+ /* We have a match. */
bcopy((char *)&local_ether.octet[0],
- (char *)&e->octet[0], 6);
+ (char *)&e->octet[0], 6);
fclose(fp);
return(0);
}
==== //depot/projects/arm/src/lib/libc/net/ethers.3#2 (text+ko) ====
@@ -1,5 +1,6 @@
-.\" Copyright (c) 1995
-.\" Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
+.\" Copyright (c) 1995 Bill Paul <wpaul at ctr.columbia.edu>.
+.\" Copyright (c) 2007 Robert N. M. Watson
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list