Date: Fri, 2 Mar 2007 07:43:41 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 115237 for review Message-ID: <200703020743.l227hfTw041663@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=115237 Change 115237 by mjacob@mjexp on 2007/03/02 07:42:40 IFC Affected files ... .. //depot/projects/mjexp/Makefile.inc1#5 integrate .. //depot/projects/mjexp/ObsoleteFiles.inc#9 integrate .. //depot/projects/mjexp/UPDATING#9 integrate .. //depot/projects/mjexp/bin/df/df.1#2 integrate .. //depot/projects/mjexp/bin/rcp/rcp.1#2 integrate .. //depot/projects/mjexp/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/mjexp/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/mjexp/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#4 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/mjexp/include/protocols/dumprestore.h#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/mjexp/lib/libc/gen/tls.c#3 integrate .. //depot/projects/mjexp/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/mjexp/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/mjexp/lib/libc/net/addr2ascii.3#2 delete .. //depot/projects/mjexp/lib/libc/net/addr2ascii.c#2 delete .. //depot/projects/mjexp/lib/libc/net/ascii2addr.c#2 delete .. //depot/projects/mjexp/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/mjexp/lib/libc/net/inet.3#4 integrate .. //depot/projects/mjexp/lib/libc/net/linkaddr.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/mjexp/lib/libc/posix1e/acl_from_text.c#2 integrate .. //depot/projects/mjexp/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/mjexp/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/mjexp/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/mjexp/lib/libncp/ipxsap.h#3 integrate .. //depot/projects/mjexp/lib/libwrap/Makefile#3 integrate .. //depot/projects/mjexp/sbin/dump/dump.h#2 integrate .. //depot/projects/mjexp/sbin/dump/traverse.c#2 integrate .. //depot/projects/mjexp/sbin/geom/class/Makefile#5 integrate .. //depot/projects/mjexp/sbin/geom/class/multipath/gmultipath.8#1 branch .. //depot/projects/mjexp/sbin/ifconfig/af_atalk.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_inet.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_ipx.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/mjexp/sbin/restore/dirs.c#2 integrate .. //depot/projects/mjexp/sbin/restore/extern.h#2 integrate .. //depot/projects/mjexp/sbin/restore/restore.h#3 integrate .. //depot/projects/mjexp/sbin/restore/tape.c#3 integrate .. //depot/projects/mjexp/share/man/man4/bpf.4#2 integrate .. //depot/projects/mjexp/share/man/man4/isp.4#2 integrate .. //depot/projects/mjexp/share/man/man4/multicast.4#2 integrate .. //depot/projects/mjexp/share/man/man4/sctp.4#2 integrate .. //depot/projects/mjexp/share/man/man4/tcp.4#3 integrate .. //depot/projects/mjexp/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#10 integrate .. //depot/projects/mjexp/share/man/man9/extattr.9#2 integrate .. //depot/projects/mjexp/share/man/man9/mbuf.9#4 integrate .. //depot/projects/mjexp/share/man/man9/rwlock.9#2 integrate .. //depot/projects/mjexp/share/man/man9/sleep.9#3 integrate .. //depot/projects/mjexp/share/man/man9/vm_page_deactivate.9#2 integrate .. //depot/projects/mjexp/share/man/man9/vm_page_unmanage.9#2 delete .. //depot/projects/mjexp/share/monetdef/ru_RU.CP1251.src#2 integrate .. //depot/projects/mjexp/share/monetdef/ru_RU.CP866.src#2 integrate .. //depot/projects/mjexp/share/monetdef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/mjexp/share/monetdef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/mjexp/share/monetdef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/mjexp/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/mjexp/sys/arm/arm/locore.S#3 integrate .. //depot/projects/mjexp/sys/arm/arm/support.S#2 integrate .. //depot/projects/mjexp/sys/arm/arm/trap.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/at91.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/mjexp/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/mjexp/sys/arm/conf/AVILA#2 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/sa11x0_ost.c#4 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#10 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/mjexp/sys/conf/NOTES#13 integrate .. //depot/projects/mjexp/sys/conf/files#14 integrate .. //depot/projects/mjexp/sys/conf/options#12 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/mjexp/sys/dev/em/if_em.c#5 integrate .. //depot/projects/mjexp/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/mjexp/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/mjexp/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/mjexp/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/mjexp/sys/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/mjexp/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/mjexp/sys/dev/re/if_re.c#8 integrate .. //depot/projects/mjexp/sys/dev/scd/scd.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midi.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/midiq.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu401.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpu_if.m#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/mpufoi_if.m#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/sequencer.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/midi/synth_if.m#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/mjexp/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/umass.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/mjexp/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/mjexp/sys/dev/zs/z8530var.h#2 integrate .. //depot/projects/mjexp/sys/dev/zs/zs.c#3 integrate .. //depot/projects/mjexp/sys/dev/zs/zs_macio.c#2 integrate .. //depot/projects/mjexp/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/mjexp/sys/fs/smbfs/smbfs_smb.c#3 integrate .. //depot/projects/mjexp/sys/geom/geom_dev.c#3 integrate .. //depot/projects/mjexp/sys/geom/geom_io.c#5 integrate .. //depot/projects/mjexp/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/mjexp/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate .. //depot/projects/mjexp/sys/i386/linux/linux.h#8 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/mjexp/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_jail.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_linker.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_lock.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_resource.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_sx.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_synch.c#8 integrate .. //depot/projects/mjexp/sys/kern/link_elf.c#3 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#11 integrate .. //depot/projects/mjexp/sys/kern/subr_bus.c#3 integrate .. //depot/projects/mjexp/sys/kern/subr_lock.c#4 integrate .. //depot/projects/mjexp/sys/kern/sys_generic.c#3 integrate .. //depot/projects/mjexp/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/mjexp/sys/modules/geom/Makefile#6 integrate .. //depot/projects/mjexp/sys/net/bpf.c#5 integrate .. //depot/projects/mjexp/sys/net/bpf.h#2 integrate .. //depot/projects/mjexp/sys/net/bpfdesc.h#3 integrate .. //depot/projects/mjexp/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/mjexp/sys/netinet/in.h#4 integrate .. //depot/projects/mjexp/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/mjexp/sys/netinet/ip_output.c#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/mjexp/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/mjexp/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/mjexp/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/mjexp/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/mjexp/sys/netipx/ipx_ip.h#3 integrate .. //depot/projects/mjexp/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/mjexp/sys/pc98/cbus/clock.c#5 integrate .. //depot/projects/mjexp/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/mjexp/sys/sys/extattr.h#2 integrate .. //depot/projects/mjexp/sys/sys/lock.h#4 integrate .. //depot/projects/mjexp/sys/sys/lock_profile.h#3 integrate .. //depot/projects/mjexp/sys/sys/mbuf.h#4 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#4 integrate .. //depot/projects/mjexp/sys/sys/priv.h#3 integrate .. //depot/projects/mjexp/sys/sys/rwlock.h#3 integrate .. //depot/projects/mjexp/sys/sys/systm.h#8 integrate .. //depot/projects/mjexp/sys/sys/unpcb.h#3 integrate .. //depot/projects/mjexp/sys/tools/fw_stub.awk#3 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/mjexp/sys/vm/phys_pager.c#3 integrate .. //depot/projects/mjexp/sys/vm/swap_pager.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_kern.c#5 integrate .. //depot/projects/mjexp/sys/vm/vm_map.c#3 integrate .. //depot/projects/mjexp/sys/vm/vm_object.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#8 integrate .. //depot/projects/mjexp/sys/vm/vm_page.h#4 integrate .. //depot/projects/mjexp/tools/regression/ethernet/ethermulti/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/ethernet/ethermulti/ethermulti.c#1 branch .. //depot/projects/mjexp/tools/regression/netinet/ipbroadcast/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/netinet/ipbroadcast/ipbroadcast.c#1 branch .. //depot/projects/mjexp/usr.bin/cut/cut.1#2 integrate .. //depot/projects/mjexp/usr.bin/find/find.1#4 integrate .. //depot/projects/mjexp/usr.bin/netstat/bpf.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/if.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/mcast.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/mroute.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/mroute6.c#3 integrate .. //depot/projects/mjexp/usr.bin/rup/rup.1#2 integrate .. //depot/projects/mjexp/usr.bin/setchannel/setchannel.1#2 integrate .. //depot/projects/mjexp/usr.bin/setchannel/setchannel.c#2 integrate .. //depot/projects/mjexp/usr.bin/ul/ul.1#2 integrate .. //depot/projects/mjexp/usr.sbin/fdformat/fdformat.1#2 integrate .. //depot/projects/mjexp/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ypset/ypset.c#2 integrate Differences ... ==== //depot/projects/mjexp/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.566 2007/01/20 07:48:09 rafan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.569 2007/03/01 15:42:23 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -235,36 +235,30 @@ .else LIB32CPUTYPE= ${TARGET_CPUTYPE} .endif -LIB32PREFLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT -LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ +LIB32FLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT \ + -iprefix ${LIB32TMP}/usr/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 -LIB32CC= ${LIB32PREFLAGS} \ - ${LIB32POSTFLAGS} -LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ - ${LIB32POSTFLAGS} -LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ - ${LIB32POSTFLAGS} # Yes, the flags are redundant. -LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ MACHINE=i386 \ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ - CC="${CC} ${LIB32CC}" \ - CXX="${CXX} ${LIB32CXX}" \ - OBJC="${OBJC} ${LIB32OBJC}" \ + CC="${CC} ${LIB32FLAGS}" \ + CXX="${CXX} ${LIB32FLAGS}" \ + OBJC="${OBJC} ${LIB32FLAGS}" \ LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="${AS} --32" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 -LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ +LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ - -DWITHOUT_HTML -LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS + -DWITHOUT_HTML DESTDIR=${LIB32TMP} +LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS .endif # install stage @@ -364,7 +358,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} .if ${TARGET_ARCH} == "amd64" - rm -rf ${OBJTREE}/lib32 + ${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/} .endif .endif _obj: @@ -434,34 +428,28 @@ .endfor .endif .for _t in obj includes - cd ${.CURDIR}/include; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} - cd ${.CURDIR}/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} - cd ${.CURDIR}/gnu/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} + cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} .if ${MK_CRYPT} != "no" - cd ${.CURDIR}/secure/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} .endif .if ${MK_KERBEROS} != "no" - cd ${.CURDIR}/kerberos5/lib; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} ${_t} .endif .endfor .for _dir in usr.bin/lex/lib - cd ${.CURDIR}/${_dir}; \ - ${LIB32MAKE} DESTDIR=${LIB32TMP} obj + cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj .endfor .for _dir in lib/ncurses/ncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools .endfor cd ${.CURDIR}; \ - ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries + ${LIB32WMAKE} -f Makefile.inc1 libraries .for _t in obj depend all cd ${.CURDIR}/libexec/rtld-elf; \ - PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t} .endfor distribute32 install32: @@ -869,7 +857,7 @@ _mklocale= usr.bin/mklocale .endif -.if ${BOOTSTRAPPING} < 700015 +.if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif ==== //depot/projects/mjexp/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.73 2007/02/12 21:41:17 brueffer Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.75 2007/03/01 10:53:55 bms 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,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070301: remove addr2ascii and ascii2addr +OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz +# 20070225: vm_page_unmanage() removed +OLD_FILES+=usr/share/man/man9/vm_page_unmanage.9.gz # 20070212: kame.4 removed OLD_FILES+=usr/share/man/man4/kame.4.gz # 20070201: remove libmytinfo link ==== //depot/projects/mjexp/UPDATING#9 (text+ko) ==== @@ -21,24 +21,26 @@ developers choose to disable these features on build machines to maximize performance. +20070228: + The name resolution/mapping functions addr2ascii(3) and ascii2addr(3) + were removed from FreeBSD's libc. These originally came from INRIA + IPv6. Nothing in FreeBSD ever used them. They may be regarded as + deprecated in previous releases. + The AF_LINK support for getnameinfo(3) was merged from NetBSD to + replace it as a more portable (and re-entrant) API. + +20070224: + To support interrupt filtering a modification to the newbus API + has occurred, ABI was broken and __FreeBSD_version was bumped + to 700031. Please make sure that your kernel and modules are in + sync. For more info: + http://docs.freebsd.org/cgi/mid.cgi?20070221233124.GA13941 + 20070224: The IPv6 multicast forwarding code may now be loaded into GENERIC - kernels by loading the ip_mroute.ko module. - The module build heeds the MK_INET6_SUPPORT make.conf option; it - may be set to "no" to omit building the IPv6 support. - -20070218: - The following build error may appear when upgrading from an old - -current (usr.sbin/bsnmpd/modules/snmp_bridge, depend stage): - line 31: '(' expected at begin of node - context: " TruthValue ENUM ( - *** Error code 1 - If so, run "make install" in usr.sbin/bsnmpd/gensnmptree. (It - should probably be a build tool). In the same module, you may - also get the error: - ...snmp_bridge/bridge_sys.c:39:27: - net/bridgestp.h: No such file or directory - If so, run "cp src/sys/net/bridgestp.h /usr/include/net". + kernels by loading the ip_mroute.ko module. This is built into the + module unless WITHOUT_INET6 or WITHOUT_INET6_SUPPORT options are + set; see src.conf(5) for more information. 20070214: The output of netstat -r has changed. Without -n, we now only @@ -749,4 +751,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.475 2007/02/24 11:41:05 bms Exp $ +$FreeBSD: src/UPDATING,v 1.481 2007/03/01 15:42:23 ru Exp $ ==== //depot/projects/mjexp/bin/df/df.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.39 2005/01/16 16:41:56 ru Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.40 2007/02/28 10:29:48 ru Exp $ .\" .Dd April 22, 2004 .Dt DF 1 @@ -58,9 +58,10 @@ option below). .Pp The following options are available: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl a -Show all mount points, including those that were mounted with the MNT_IGNORE +Show all mount points, including those that were mounted with the +.Dv MNT_IGNORE flag. .It Fl b Use 512-byte blocks rather than the default. ==== //depot/projects/mjexp/bin/rcp/rcp.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rcp.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.21 2005/02/13 22:25:09 ru Exp $ +.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.22 2007/02/27 11:25:58 ru Exp $ .\" .Dd October 16, 2002 .Dt RCP 1 @@ -53,9 +53,15 @@ .Ar directory argument is either a remote file name of the form -.Dq rname@rhost:path , -or a local file name (containing no `:' characters, -or a `/' before any `:'s). +.Dq ruser@rhost:path , +or a local file name (containing no +.Ql :\& +characters, +or a +.Ql / +before any +.Ql :\& Ns +s). .Pp The following options are available: .Bl -tag -width indent @@ -68,7 +74,7 @@ .Nm to attempt to preserve (duplicate) in its copies the modification times and modes of the source files, ignoring the -.Ar umask . +.Xr umask 2 . By default, the mode and owner of .Ar file2 are preserved if it already existed; otherwise the mode of the source file @@ -92,7 +98,11 @@ or your current user name if no other remote user name is specified. A .Ar path -on a remote host may be quoted (using \e, ", or \(aa) +on a remote host may be quoted (using +.Ql \e , +.Ql \&" , +or +.Ql \(aa ) so that the metacharacters are interpreted remotely. .Pp The @@ -107,7 +117,7 @@ utility handles third party copies, where neither source nor target files are on the current machine. .Sh FILES -.Bl -tag -width /etc/auth.conf -compact +.Bl -tag -width ".Pa /etc/auth.conf" -compact .It Pa /etc/auth.conf configure authentication services .El @@ -133,14 +143,14 @@ be a file in cases where only a directory should be legal. .Pp Is confused by any output generated by commands in a -.Pa \&.login , -.Pa \&.profile , +.Pa .login , +.Pa .profile , or -.Pa \&.cshrc +.Pa .cshrc file on the remote host. .Pp The destination user and hostname may have to be specified as -.Dq rhost.rname +.Dq rhost.ruser when the destination machine is running the .Bx 4.2 version of ==== //depot/projects/mjexp/bin/setfacl/setfacl.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.12 2006/06/09 16:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.13 2007/02/26 00:42:17 mckusick Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -253,10 +253,20 @@ if (need_mask && (set_acl_mask(&final_acl) == -1)) { warnx("failed to set ACL mask on %s", file->filename); carried_error++; - } else if (acl_set_file(file->filename, acl_type, - final_acl) == -1) { - carried_error++; - warn("acl_set_file() failed for %s", file->filename); + } else if (h_flag) { + if (acl_set_link_np(file->filename, acl_type, + final_acl) == -1) { + carried_error++; + warn("acl_set_link_np() failed for %s", + file->filename); + } + } else { + if (acl_set_file(file->filename, acl_type, + final_acl) == -1) { + carried_error++; + warn("acl_set_file() failed for %s", + file->filename); + } } acl_free(acl[ACCESS_ACL]); ==== //depot/projects/mjexp/contrib/libpcap/pcap-bpf.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.2 2006/09/04 20:12:45 sam Exp $ + * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.3 2007/02/26 22:24:14 jkim Exp $ */ #ifndef lint static const char rcsid[] _U_ = @@ -1093,9 +1093,22 @@ static int pcap_setdirection_bpf(pcap_t *p, pcap_direction_t d) { -#ifdef BIOCSSEESENT +#if defined(BIOCSDIRECTION) + u_int direction; + + direction = (d == PCAP_D_IN) ? BPF_D_IN : + ((d == PCAP_D_OUT) ? BPF_D_OUT : BPF_D_INOUT); + if (ioctl(p->fd, BIOCSDIRECTION, &direction) == -1) { + (void) snprintf(p->errbuf, sizeof(p->errbuf), + "Cannot set direction to %s: %s", + (d == PCAP_D_IN) ? "PCAP_D_IN" : + ((d == PCAP_D_OUT) ? "PCAP_D_OUT" : "PCAP_D_INOUT"), + strerror(errno)); + return (-1); + } + return (0); +#elif defined(BIOCSSEESENT) u_int seesent; -#endif /* * We don't support PCAP_D_OUT. @@ -1105,7 +1118,7 @@ "Setting direction to PCAP_D_OUT is not supported on BPF"); return -1; } -#ifdef BIOCSSEESENT + seesent = (d == PCAP_D_INOUT); if (ioctl(p->fd, BIOCSSEESENT, &seesent) == -1) { (void) snprintf(p->errbuf, sizeof(p->errbuf), ==== //depot/projects/mjexp/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.110 2006/10/31 22:22:29 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.111 2007/02/27 04:01:57 mjacob Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # ==== //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kgdb.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.3 2005/09/10 18:25:53 marcel Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.4 2007/03/01 13:55:15 kib Exp $ */ #ifndef _KGDB_H_ @@ -62,4 +62,6 @@ struct kthr *kgdb_thr_select(struct kthr *); char *kgdb_thr_extra_thread_info(int); +uintptr_t kgdb_lookup(const char *sym); + #endif /* _KGDB_H_ */ ==== //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/kthr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.6 2007/01/25 06:39:25 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.7 2007/03/01 13:55:15 kib Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -52,8 +52,8 @@ static struct kthr *first; struct kthr *curkthr; -static uintptr_t -lookup(const char *sym) +uintptr_t +kgdb_lookup(const char *sym) { struct nlist nl[2]; @@ -80,28 +80,28 @@ struct kthr *kt; uintptr_t addr, paddr; - addr = lookup("_allproc"); + addr = kgdb_lookup("_allproc"); if (addr == 0) return (NULL); kvm_read(kvm, addr, &paddr, sizeof(paddr)); - dumppcb = lookup("_dumppcb"); + dumppcb = kgdb_lookup("_dumppcb"); if (dumppcb == 0) return (NULL); - addr = lookup("_dumptid"); + addr = kgdb_lookup("_dumptid"); if (addr != 0) kvm_read(kvm, addr, &dumptid, sizeof(dumptid)); else dumptid = -1; - addr = lookup("_stopped_cpus"); + addr = kgdb_lookup("_stopped_cpus"); if (addr != 0) kvm_read(kvm, addr, &stopped_cpus, sizeof(stopped_cpus)); else stopped_cpus = 0; - stoppcbs = lookup("_stoppcbs"); + stoppcbs = kgdb_lookup("_stoppcbs"); while (paddr != 0) { if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) { ==== //depot/projects/mjexp/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.5 2005/09/11 05:36:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.6 2007/03/01 13:56:08 kib Exp $"); #include <sys/types.h> #include <machine/pcb.h> @@ -134,6 +134,8 @@ char dummy_valuep[MAX_REGISTER_SIZE]; struct kgdb_frame_cache *cache; int ofs, regsz; + static int ofs_fix = 0; + static int ofs_fixed = 0; regsz = register_size(current_gdbarch, regnum); @@ -145,8 +147,27 @@ *lvalp = not_lval; *realnump = -1; + if (!ofs_fixed) { + uintptr_t calltrap_addr; + char calltrap[1]; + + calltrap_addr = kgdb_lookup("calltrap"); + if (calltrap_addr != 0) { + if (kvm_read(kvm, calltrap_addr, calltrap, + sizeof(calltrap)) != sizeof(calltrap)) { + warnx("kvm_read: %s", kvm_geterr(kvm)); + } else if (calltrap[0] == 0x54) /* push %esp */ { + /* + * To accomodate for rev. 1.117 of + * i386/i386/exception.s + */ + ofs_fix = 4; + } + } + ofs_fixed = 1; + } ofs = (regnum >= I386_EAX_REGNUM && regnum <= I386_FS_REGNUM) - ? kgdb_trgt_frame_offset[regnum] : -1; + ? kgdb_trgt_frame_offset[regnum] + ofs_fix : -1; if (ofs == -1) return; ==== //depot/projects/mjexp/include/protocols/dumprestore.h#2 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)dumprestore.h 8.2 (Berkeley) 1/21/94 * - * $FreeBSD: src/include/protocols/dumprestore.h,v 1.10 2002/07/17 02:03:19 mckusick Exp $ + * $FreeBSD: src/include/protocols/dumprestore.h,v 1.11 2007/02/26 08:15:56 mckusick Exp $ */ #ifndef _PROTOCOLS_DUMPRESTORE_H_ @@ -97,7 +97,8 @@ int64_t c_birthtime; /* creation time, seconds */ int64_t c_atime; /* last access time, seconds */ int64_t c_mtime; /* last modified time, seconds */ - int32_t c_spare4[7]; /* old block pointers */ + int32_t c_extsize; /* external attribute size */ + int32_t c_spare4[6]; /* old block pointers */ u_int32_t c_file_flags; /* status flags (chflags) */ int32_t c_spare5[2]; /* old blocks, generation number */ u_int32_t c_uid; /* file owner */ ==== //depot/projects/mjexp/lib/libarchive/archive_entry.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.37 2007/01/09 08:05:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.38 2007/03/01 06:22:34 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -760,6 +760,12 @@ } void +archive_entry_copy_symlink(struct archive_entry *entry, const char *linkname) +{ + aes_copy_mbs(&entry->ae_symlink, linkname); +} + +void archive_entry_copy_symlink_w(struct archive_entry *entry, const wchar_t *linkname) { aes_copy_wcs(&entry->ae_symlink, linkname); ==== //depot/projects/mjexp/lib/libarchive/archive_entry.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.20 2007/01/09 08:05:54 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.21 2007/03/01 06:22:34 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -130,6 +130,7 @@ void archive_entry_set_rdevminor(struct archive_entry *, dev_t); void archive_entry_set_size(struct archive_entry *, int64_t); void archive_entry_set_symlink(struct archive_entry *, const char *); +void archive_entry_copy_symlink(struct archive_entry *, const char *); void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *); void archive_entry_set_uid(struct archive_entry *, uid_t); void archive_entry_set_uname(struct archive_entry *, const char *); ==== //depot/projects/mjexp/lib/libarchive/archive_read_support_format_iso9660.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.18 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.19 2007/03/01 06:22:34 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -378,7 +378,7 @@ archive_entry_set_pathname(entry, build_pathname(&iso9660->pathname, file)); if (file->symlink.s != NULL) - archive_entry_set_symlink(entry, file->symlink.s); + archive_entry_copy_symlink(entry, file->symlink.s); /* If this entry points to the same data as the previous * entry, convert this into a hardlink to that entry. ==== //depot/projects/mjexp/lib/libc/gen/tls.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/gen/tls.c,v 1.13 2006/10/08 02:50:33 kmacy Exp $ + * $FreeBSD: src/lib/libc/gen/tls.c,v 1.14 2007/02/25 21:23:50 kientzle Exp $ */ /* @@ -36,7 +36,6 @@ #include <stdlib.h> #include <string.h> #include <elf.h> -#include <assert.h> #include "libc_private.h" @@ -207,7 +206,8 @@ size = round(tls_static_space, tcbalign); - assert(tcbsize >= 2*sizeof(Elf_Addr)); + if (tcbsize < 2 * sizeof(Elf_Addr)) + tcbsize = 2 * sizeof(Elf_Addr); tls = calloc(1, size + tcbsize); dtv = malloc(3 * sizeof(Elf_Addr)); ==== //depot/projects/mjexp/lib/libc/net/Makefile.inc#5 (text+ko) ==== @@ -1,10 +1,10 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.64 2007/02/22 14:32:38 rrs Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.65 2007/02/28 21:18:38 bms Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net -SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c eui64.c \ +SRCS+= base64.c ether_addr.c eui64.c \ gai_strerror.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ getifaddrs.c getifmaddrs.c getnameinfo.c \ @@ -43,7 +43,7 @@ ${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} -MAN+= addr2ascii.3 byteorder.3 ethers.3 eui64.3 \ +MAN+= byteorder.3 ethers.3 eui64.3 \ getaddrinfo.3 gai_strerror.3 gethostbyname.3 \ getifaddrs.3 getifmaddrs.3 getipnodebyname.3 \ getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 \ @@ -56,7 +56,6 @@ sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \ sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \ -MLINKS+=addr2ascii.3 ascii2addr.3 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ byteorder.3 ntohs.3 MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \ ==== //depot/projects/mjexp/lib/libc/net/Symbol.map#2 (text) ==== @@ -1,8 +1,6 @@ -# $FreeBSD: src/lib/libc/net/Symbol.map,v 1.6 2006/05/21 11:19:36 ume Exp $ +# $FreeBSD: src/lib/libc/net/Symbol.map,v 1.7 2007/02/28 21:18:38 bms Exp $ FBSD_1.0 { - addr2ascii; - ascii2addr; __b64_ntop; __b64_pton; ether_line; ==== //depot/projects/mjexp/lib/libc/net/getnameinfo.3#2 (text+ko) ==== @@ -16,9 +16,9 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.24 2005/06/15 19:04:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.25 2007/02/28 21:28:33 bms Exp $ .\" -.Dd December 20, 2004 +.Dd February 28, 2007 .Dt GETNAMEINFO 3 .Os .Sh NAME @@ -47,15 +47,29 @@ .Xr getaddrinfo 3 function. .Pp +If a link-layer address is passed to +.Fn getnameinfo , +its ASCII representation will be stored in +.Fa host . +The string pointed to by +.Fa serv +will be set to the empty string if non-NULL; +.Fa flags +will always be ignored. +This is intended as a replacement for the legacy +.Xr link_ntoa 3 +function. +.Pp The .Li sockaddr structure .Fa sa should point to either a -.Li sockaddr_in +.Li sockaddr_in , +.Li sockaddr_in6 or -.Li sockaddr_in6 -structure (for IPv4 or IPv6 respectively) that is +.Li sockaddr_dl +structure (for IPv4, IPv6 or link-layer respectively) that is .Fa salen bytes long. .Pp @@ -166,6 +180,7 @@ .Xr gethostbyaddr 3 , .Xr getservbyport 3 , .Xr inet_ntop 3 , +.Xr link_ntoa 3 , .Xr resolver 3 , .Xr hosts 5 , .Xr resolv.conf 5 , ==== //depot/projects/mjexp/lib/libc/net/getnameinfo.c#2 (text+ko) ==== @@ -2,6 +2,7 @@ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + * Copyright (c) 2000 Ben Harris. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,11 +45,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.19 2006/05/21 11:22:31 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.20 2007/02/28 21:18:38 bms Exp $"); #include <sys/types.h> #include <sys/socket.h> #include <net/if.h> +#include <net/if_dl.h> +#include <net/if_types.h> #include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> @@ -58,6 +61,38 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703020743.l227hfTw041663>