PERFORCE change 158534 for review

Arnar Mar Sig antab at FreeBSD.org
Sun Mar 1 08:07:52 PST 2009


http://perforce.freebsd.org/chv.cgi?CH=158534

Change 158534 by antab at antab_farm on 2009/03/01 16:07:14

	IFC @158479

Affected files ...

.. //depot/projects/avr32/src/ObsoleteFiles.inc#3 integrate
.. //depot/projects/avr32/src/UPDATING#3 integrate
.. //depot/projects/avr32/src/bin/ps/extern.h#2 integrate
.. //depot/projects/avr32/src/bin/ps/keyword.c#2 integrate
.. //depot/projects/avr32/src/bin/ps/print.c#2 integrate
.. //depot/projects/avr32/src/contrib/less/line.c#2 integrate
.. //depot/projects/avr32/src/contrib/telnet/libtelnet/pk.c#2 integrate
.. //depot/projects/avr32/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/avr32/src/include/stdio.h#2 integrate
.. //depot/projects/avr32/src/include/string.h#3 integrate
.. //depot/projects/avr32/src/include/wchar.h#3 integrate
.. //depot/projects/avr32/src/lib/libc/stdio/Makefile.inc#2 integrate
.. //depot/projects/avr32/src/lib/libc/stdio/Symbol.map#2 integrate
.. //depot/projects/avr32/src/lib/libc/stdio/fgetln.3#2 integrate
.. //depot/projects/avr32/src/lib/libc/stdio/fgets.3#2 integrate
.. //depot/projects/avr32/src/lib/libc/stdio/getdelim.c#1 branch
.. //depot/projects/avr32/src/lib/libc/stdio/getline.3#1 branch
.. //depot/projects/avr32/src/lib/libc/stdio/getline.c#1 branch
.. //depot/projects/avr32/src/lib/libc/stdio/printf-pos.c#2 integrate
.. //depot/projects/avr32/src/lib/libc/stdio/stdio.3#2 integrate
.. //depot/projects/avr32/src/lib/libc/stdio/vfprintf.c#3 integrate
.. //depot/projects/avr32/src/lib/libc/stdio/vfwprintf.c#3 integrate
.. //depot/projects/avr32/src/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/avr32/src/lib/libc/string/Symbol.map#2 integrate
.. //depot/projects/avr32/src/lib/libc/string/stpcpy.c#2 integrate
.. //depot/projects/avr32/src/lib/libc/string/stpncpy.c#1 branch
.. //depot/projects/avr32/src/lib/libc/string/strcpy.3#2 integrate
.. //depot/projects/avr32/src/lib/libc/string/strlcat.c#2 integrate
.. //depot/projects/avr32/src/lib/libc/string/strlcpy.3#2 integrate
.. //depot/projects/avr32/src/lib/libc/string/strlcpy.c#2 integrate
.. //depot/projects/avr32/src/lib/libc/string/strlen.3#2 integrate
.. //depot/projects/avr32/src/lib/libc/string/strnlen.c#1 branch
.. //depot/projects/avr32/src/lib/libc/string/wcscasecmp.c#1 branch
.. //depot/projects/avr32/src/lib/libc/string/wcsncasecmp.c#1 branch
.. //depot/projects/avr32/src/lib/libc/string/wcsnlen.c#1 branch
.. //depot/projects/avr32/src/lib/libc/string/wmemchr.3#2 integrate
.. //depot/projects/avr32/src/lib/libc/sys/open.2#2 integrate
.. //depot/projects/avr32/src/lib/libcompat/4.3/rexec.c#2 integrate
.. //depot/projects/avr32/src/lib/libmp/Makefile#2 integrate
.. //depot/projects/avr32/src/lib/libmp/Symbol.map#1 branch
.. //depot/projects/avr32/src/lib/libmp/libmp.3#2 integrate
.. //depot/projects/avr32/src/lib/libmp/mp.h#2 integrate
.. //depot/projects/avr32/src/lib/libmp/mpasbn.c#2 integrate
.. //depot/projects/avr32/src/lib/librpcsvc/rnusers.c#2 integrate
.. //depot/projects/avr32/src/lib/librpcsvc/rstat.c#2 integrate
.. //depot/projects/avr32/src/lib/librpcsvc/rwall.c#2 integrate
.. //depot/projects/avr32/src/lib/librpcsvc/secretkey.c#2 integrate
.. //depot/projects/avr32/src/lib/librpcsvc/xcrypt.c#2 integrate
.. //depot/projects/avr32/src/lib/libtelnet/Makefile#2 integrate
.. //depot/projects/avr32/src/lib/libusb20/libusb20.3#3 integrate
.. //depot/projects/avr32/src/lib/libusb20/libusb20.c#3 integrate
.. //depot/projects/avr32/src/lib/libusb20/libusb20.h#3 integrate
.. //depot/projects/avr32/src/lib/libusb20/libusb20_int.h#3 integrate
.. //depot/projects/avr32/src/lib/libusb20/libusb20_ugen20.c#3 integrate
.. //depot/projects/avr32/src/lib/libusbhid/descr.c#3 integrate
.. //depot/projects/avr32/src/sbin/ifconfig/ifclone.c#2 integrate
.. //depot/projects/avr32/src/sbin/ifconfig/ifconfig.h#2 integrate
.. //depot/projects/avr32/src/sbin/ifconfig/ifieee80211.c#3 integrate
.. //depot/projects/avr32/src/sbin/ifconfig/ifvlan.c#2 integrate
.. //depot/projects/avr32/src/sbin/newfs_msdos/newfs_msdos.c#2 integrate
.. //depot/projects/avr32/src/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/avr32/src/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/avr32/src/sys/arm/at91/files.at91#2 integrate
.. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/avr32/src/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/avr32/src/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_sockio.c#2 integrate
.. //depot/projects/avr32/src/sys/conf/files.amd64#3 integrate
.. //depot/projects/avr32/src/sys/conf/files.i386#3 integrate
.. //depot/projects/avr32/src/sys/conf/files.ia64#3 integrate
.. //depot/projects/avr32/src/sys/conf/files.mips#2 integrate
.. //depot/projects/avr32/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/avr32/src/sys/conf/files.powerpc#3 integrate
.. //depot/projects/avr32/src/sys/conf/files.sparc64#3 integrate
.. //depot/projects/avr32/src/sys/conf/files.sun4v#2 integrate
.. //depot/projects/avr32/src/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/avr32/src/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/avr32/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/avr32/src/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/avr32/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/atapi-cam.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/atapi-fd.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ata/atapi-tape.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/drmP.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/drm_bufs.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/drm_drv.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/drm_irq.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/drm_lock.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/i915_drv.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/i915_drv.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/i915_irq.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/i915_reg.h#1 branch
.. //depot/projects/avr32/src/sys/dev/drm/mach64_drv.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/mach64_drv.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/mach64_irq.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/mga_dma.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/mga_irq.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/r128_drv.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/r128_drv.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/r128_irq.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/radeon_cp.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/drm/radeon_irq.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/syscons/scterm-teken.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/image/uscanner.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/input/uhid.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/input/ums.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/misc/ufm.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/ulpt.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/storage/urio.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_bus.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_core.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_dev.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_dev.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_device.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_device.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_generic.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_ioctl.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rum.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_ural.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zyd.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate
.. //depot/projects/avr32/src/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/avr32/src/sys/fs/udf/udf.h#3 integrate
.. //depot/projects/avr32/src/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/avr32/src/sys/fs/udf/udf_vnops.c#3 integrate
.. //depot/projects/avr32/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate
.. //depot/projects/avr32/src/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/avr32/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/kern_condvar.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_cons.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_priv.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_time.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_uuid.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/subr_prf.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/tty.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/tty_info.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/tty_inq.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/tty_outq.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/tty_pts.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/tty_pty.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/tty_ttydisc.c#2 integrate
.. //depot/projects/avr32/src/sys/libkern/memmove.c#1 branch
.. //depot/projects/avr32/src/sys/libkern/strtouq.c#2 integrate
.. //depot/projects/avr32/src/sys/net/bridgestp.c#2 integrate
.. //depot/projects/avr32/src/sys/net/if.c#3 integrate
.. //depot/projects/avr32/src/sys/net/if_ef.c#2 integrate
.. //depot/projects/avr32/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/avr32/src/sys/net/if_loop.c#2 integrate
.. //depot/projects/avr32/src/sys/net/if_mib.c#2 integrate
.. //depot/projects/avr32/src/sys/net/if_vlan.c#3 integrate
.. //depot/projects/avr32/src/sys/net/raw_cb.c#2 integrate
.. //depot/projects/avr32/src/sys/net/raw_usrreq.c#2 integrate
.. //depot/projects/avr32/src/sys/net/vnet.h#3 integrate
.. //depot/projects/avr32/src/sys/net80211/ieee80211_ddb.c#3 integrate
.. //depot/projects/avr32/src/sys/net80211/ieee80211_freebsd.h#3 integrate
.. //depot/projects/avr32/src/sys/netgraph/atm/ng_atm.c#2 integrate
.. //depot/projects/avr32/src/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate
.. //depot/projects/avr32/src/sys/netgraph/ng_ether.c#2 integrate
.. //depot/projects/avr32/src/sys/netgraph/ng_gif.c#2 integrate
.. //depot/projects/avr32/src/sys/netgraph/ng_l2tp.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet/igmp.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet/in_rmx.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet/raw_ip.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_crc32.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_output.h#3 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet6/in6.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet6/in6_ifattach.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet6/in6_rmx.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet6/ip6_input.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/avr32/src/sys/netinet6/ip6_output.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet6/nd6_rtr.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet6/raw_ip6.c#3 integrate
.. //depot/projects/avr32/src/sys/netinet6/scope6.c#2 integrate
.. //depot/projects/avr32/src/sys/netipsec/key_debug.c#2 integrate
.. //depot/projects/avr32/src/sys/netipsec/keysock.c#2 integrate
.. //depot/projects/avr32/src/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/avr32/src/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/avr32/src/sys/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/avr32/src/sys/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/avr32/src/sys/powerpc/booke/swtch.S#2 integrate
.. //depot/projects/avr32/src/sys/powerpc/booke/trap.c#2 integrate
.. //depot/projects/avr32/src/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/avr32/src/sys/powerpc/include/frame.h#2 integrate
.. //depot/projects/avr32/src/sys/powerpc/include/pcb.h#3 integrate
.. //depot/projects/avr32/src/sys/powerpc/powerpc/genassym.c#3 integrate
.. //depot/projects/avr32/src/sys/sys/cdefs.h#3 integrate
.. //depot/projects/avr32/src/sys/sys/fcntl.h#2 integrate
.. //depot/projects/avr32/src/sys/sys/param.h#3 integrate
.. //depot/projects/avr32/src/sys/sys/priv.h#2 integrate
.. //depot/projects/avr32/src/sys/sys/systm.h#2 integrate
.. //depot/projects/avr32/src/sys/xdr/xdr_mem.c#2 integrate
.. //depot/projects/avr32/src/tools/regression/lib/libc/stdio/Makefile#2 integrate
.. //depot/projects/avr32/src/tools/regression/lib/libc/stdio/test-getdelim.c#1 branch
.. //depot/projects/avr32/src/tools/regression/lib/libc/stdio/test-printbasic.c#1 branch
.. //depot/projects/avr32/src/tools/regression/lib/libc/string/Makefile#2 integrate
.. //depot/projects/avr32/src/tools/regression/lib/libc/string/test-stpncpy.c#1 branch
.. //depot/projects/avr32/src/tools/regression/lib/libc/string/test-wcscasecmp.c#1 branch
.. //depot/projects/avr32/src/tools/regression/lib/libc/string/test-wcsnlen.c#1 branch
.. //depot/projects/avr32/src/tools/regression/lib/libmp/test-libmp.c#2 integrate
.. //depot/projects/avr32/src/tools/tools/ath/Makefile.inc#2 integrate
.. //depot/projects/avr32/src/tools/tools/ath/athregs/dumpregs_5416.c#2 integrate
.. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/Files/root/updatep1#1 branch
.. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/Files/root/updatep2#1 branch
.. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/G2348#2 integrate
.. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/G2358#2 integrate
.. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/avila#2 integrate
.. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/cambria#2 integrate
.. //depot/projects/avr32/src/usr.bin/chkey/Makefile#2 integrate
.. //depot/projects/avr32/src/usr.bin/fstat/msdosfs.c#2 integrate
.. //depot/projects/avr32/src/usr.bin/newkey/Makefile#2 integrate
.. //depot/projects/avr32/src/usr.bin/newkey/generic.c#2 integrate
.. //depot/projects/avr32/src/usr.bin/newkey/newkey.c#2 integrate
.. //depot/projects/avr32/src/usr.bin/newkey/update.c#2 integrate
.. //depot/projects/avr32/src/usr.bin/nl/nl.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/keyserv/Makefile#2 integrate
.. //depot/projects/avr32/src/usr.sbin/keyserv/setkey.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/makefs/ffs/ufs_bswap.h#2 integrate
.. //depot/projects/avr32/src/usr.sbin/pppd/cbcp.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/timed/timed/Makefile#2 integrate
.. //depot/projects/avr32/src/usr.sbin/timed/timed/networkdelta.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/timed/timedc/Makefile#2 integrate
.. //depot/projects/avr32/src/usr.sbin/trpt/trpt.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/usbconfig/dump.c#3 integrate
.. //depot/projects/avr32/src/usr.sbin/usbconfig/dump.h#3 integrate
.. //depot/projects/avr32/src/usr.sbin/usbconfig/usbconfig.c#3 integrate

Differences ...

==== //depot/projects/avr32/src/ObsoleteFiles.inc#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.173 2009/02/24 16:47:59 thompsa Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.174 2009/02/26 21:43:15 ed 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,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090226: libmp(3) functions renamed
+OLD_LIBS+=usr/lib/libmp.so.6
 # 20090223: changeover of USB stacks
 OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h

==== //depot/projects/avr32/src/UPDATING#3 (text+ko) ====

@@ -22,6 +22,10 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090227:
+	The /dev handling for the new USB stack has changed, a
+	buildworld/installworld is required for libusb20.
+
 20090223:
 	The new USB2 stack has now been permanently moved in and all kernel and
 	module names reverted to their previous values (eg, usb, ehci, ohci,
@@ -1255,4 +1259,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.569 2009/02/23 19:30:00 thompsa Exp $
+$FreeBSD: src/UPDATING,v 1.570 2009/02/27 17:32:49 thompsa Exp $

==== //depot/projects/avr32/src/bin/ps/extern.h#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $
+ * $FreeBSD: src/bin/ps/extern.h,v 1.39 2009/02/26 18:01:07 attilio Exp $
  */
 
 struct kinfo;
@@ -71,6 +71,7 @@
 void	 rgroupname(KINFO *, VARENT *);
 void	 runame(KINFO *, VARENT *);
 void	 rvar(KINFO *, VARENT *);
+int	 s_comm(KINFO *);
 int	 s_label(KINFO *);
 int	 s_rgroupname(KINFO *);
 int	 s_runame(KINFO *);

==== //depot/projects/avr32/src/bin/ps/keyword.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -79,8 +79,8 @@
 		CHAR, NULL, 0},
 	{"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
 	{"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"comm", "COMMAND", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR,
-		NULL, 0},
+	{"comm", "COMMAND", NULL, LJUST|DSIZ, ucomm, s_comm,
+		COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0},
 	{"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0,
 		CHAR, NULL, 0},
 	{"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d",
@@ -135,12 +135,13 @@
 		LONG, "ld", 0},
 	{"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw),
 		LONG, "ld", 0},
-	{"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, 8, 0, CHAR, NULL, 0},
+	{"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, sizeof(void *) * 2, 0,
+		CHAR, NULL, 0},
 	{"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock),
 		LONG, "ld", 0},
 	{"oublock", "", "oublk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"paddr", "PADDR", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR,
-		"lx", 0},
+	{"paddr", "PADDR", NULL, 0, kvar, NULL, sizeof(void *) * 2,
+		KOFF(ki_paddr), KPTR, "lx", 0},
 	{"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6, 0, CHAR, NULL, 0},
 	{"pcpu", "", "%cpu", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
 	{"pending", "", "sig", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
@@ -195,13 +196,13 @@
 	{"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0},
 	{"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0},
 	{"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0},
-	{"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL,
-		0},
+	{"ucomm", "UCOMM", NULL, LJUST|DSIZ, ucomm, s_comm,
+		COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0},
 	{"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT,
 		UIDFMT, 0},
 	{"upr", "UPR", NULL, 0, upr, NULL, 3, 0, CHAR, NULL, 0},
-	{"uprocp", "UPROCP", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR,
-		"lx", 0},
+	{"uprocp", "UPROCP", NULL, 0, kvar, NULL, sizeof(void *) * 2,
+		KOFF(ki_paddr), KPTR, "lx", 0},
 	{"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN, 0, CHAR,
 		NULL, 0},
 	{"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
@@ -325,6 +326,8 @@
 			 */
 			rflen = strlen(v->alias) + strlen(hp) + 2;
 			realfmt = malloc(rflen);
+			if (realfmt == NULL)
+				errx(1, "malloc failed");
 			snprintf(realfmt, rflen, "%s=%s", v->alias, hp);
 			parsefmt(realfmt, user);
 		}

==== //depot/projects/avr32/src/bin/ps/print.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.97 2008/11/13 15:06:40 emaste Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.98 2009/02/26 18:01:07 attilio Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -177,6 +177,7 @@
 void
 ucomm(KINFO *k, VARENT *ve)
 {
+	char tmpbuff[COMMLEN + OCOMMLEN + 2];
 	VAR *v;
 
 	v = ve->var;
@@ -184,8 +185,15 @@
 		(void)printf("%s", k->ki_p->ki_comm);
 		if (showthreads && k->ki_p->ki_numthreads > 1)
 			printf("/%s", k->ki_p->ki_ocomm);
-	} else
-		(void)printf("%-*s", v->width, k->ki_p->ki_comm);
+	} else {
+		bzero(tmpbuff, sizeof(tmpbuff));
+		if (showthreads && k->ki_p->ki_numthreads > 1)
+			sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm,
+			    k->ki_p->ki_ocomm);
+		else
+			sprintf(tmpbuff, "%s", k->ki_p->ki_comm);
+		(void)printf("%-*s", v->width, tmpbuff);
+	}
 }
 
 void
@@ -821,6 +829,20 @@
 }
 
 int
+s_comm(KINFO *k)
+{
+	char tmpbuff[COMMLEN + OCOMMLEN + 2];
+
+	bzero(tmpbuff, sizeof(tmpbuff));
+	if (showthreads && k->ki_p->ki_numthreads > 1)
+		sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm,
+		    k->ki_p->ki_ocomm);
+	else
+		sprintf(tmpbuff, "%s", k->ki_p->ki_comm);
+	return (strlen(tmpbuff));
+}
+
+int
 s_label(KINFO *k)
 {
 	char *string = NULL;

==== //depot/projects/avr32/src/contrib/less/line.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/less/line.c,v 1.6 2007/11/16 22:24:31 delphij Exp $ */
+/* $FreeBSD: src/contrib/less/line.c,v 1.7 2009/02/28 06:27:23 das Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
@@ -601,9 +601,11 @@
 	{
 		if (!is_ansi_end(ch) && !is_ansi_middle(ch)) {
 			/* Remove whole unrecognized sequence.  */
-			do {
+			while (curr) {
 				--curr;
-			} while (!IS_CSI_START(linebuf[curr]));
+				if (IS_CSI_START(linebuf[curr]))
+					break;
+			}
 			return 0;
 		}
 		a = AT_ANSI;	/* Will force re-AT_'ing around it.  */

==== //depot/projects/avr32/src/contrib/telnet/libtelnet/pk.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/pk.c,v 1.10 2002/08/22 06:19:07 nsayer Exp $");
+__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/pk.c,v 1.11 2009/02/26 21:43:15 ed Exp $");
 
 /* public key routines */
 /* functions:
@@ -68,19 +68,19 @@
         short base = (1 << 8);
         char *k;
 
-        z = itom(0);
-        a = itom(0);
-        madd(ck, z, a);
+        z = mp_itom(0);
+        a = mp_itom(0);
+        mp_madd(ck, z, a);
         for (i = 0; i < ((KEYSIZE - 128) / 8); i++) {
-                sdiv(a, base, a, &r);
+                mp_sdiv(a, base, a, &r);
         }
         k = (char *)ideakey;
         for (i = 0; i < 16; i++) {
-                sdiv(a, base, a, &r);
+                mp_sdiv(a, base, a, &r);
                 *k++ = r;
         }
-	mfree(z);
-        mfree(a);
+	mp_mfree(z);
+        mp_mfree(a);
 }
 
 /*
@@ -97,19 +97,19 @@
         short base = (1 << 8);
         char *k;
 
-        z = itom(0);
-        a = itom(0);
-        madd(ck, z, a);
+        z = mp_itom(0);
+        a = mp_itom(0);
+        mp_madd(ck, z, a);
         for (i = 0; i < ((KEYSIZE - 64) / 2) / 8; i++) {
-                sdiv(a, base, a, &r);
+                mp_sdiv(a, base, a, &r);
         }
         k = (char *)deskey;
         for (i = 0; i < 8; i++) {
-                sdiv(a, base, a, &r);
+                mp_sdiv(a, base, a, &r);
                 *k++ = r;
         }
-	mfree(z);
-        mfree(a);
+	mp_mfree(z);
+        mp_mfree(a);
 }
 
 /*
@@ -121,19 +121,19 @@
         MINT *public;
         MINT *secret;
         MINT *common;
-	MINT *modulus = xtom(HEXMODULUS);
+	MINT *modulus = mp_xtom(HEXMODULUS);
 
-        public = xtom(xpublic);
-        secret = xtom(xsecret);
-        common = itom(0);
-        pow(public, secret, modulus, common);
+        public = mp_xtom(xpublic);
+        secret = mp_xtom(xsecret);
+        common = mp_itom(0);
+        mp_pow(public, secret, modulus, common);
         extractdeskey(common, deskey);
         extractideakey(common, ideakey);
 	des_set_odd_parity(deskey);
-        mfree(common);
-        mfree(secret);
-        mfree(public);
-	mfree(modulus);
+        mp_mfree(common);
+        mp_mfree(secret);
+        mp_mfree(public);
+	mp_mfree(modulus);
 }
 
 /*
@@ -161,12 +161,12 @@
 #       define BASEBITS (8*sizeof(short) - 1)
 #       define BASE (1 << BASEBITS)
  
-        MINT *pk = itom(0);
-        MINT *sk = itom(0);
+        MINT *pk = mp_itom(0);
+        MINT *sk = mp_itom(0);
         MINT *tmp;
-        MINT *base = itom(BASE);
-        MINT *root = itom(PROOT);
-        MINT *modulus = xtom(HEXMODULUS);
+        MINT *base = mp_itom(BASE);
+        MINT *root = mp_itom(PROOT);
+        MINT *modulus = mp_xtom(HEXMODULUS);
         short r;
         unsigned short seed[KEYSIZE/BASEBITS + 1];
         char *xkey;
@@ -174,24 +174,24 @@
         getseed((char *)seed, sizeof(seed));    
         for (i = 0; i < KEYSIZE/BASEBITS + 1; i++) {
                 r = seed[i] % BASE;
-                tmp = itom(r);
-                mult(sk, base, sk);
-                madd(sk, tmp, sk);
-                mfree(tmp);  
+                tmp = mp_itom(r);
+                mp_mult(sk, base, sk);
+                mp_madd(sk, tmp, sk);
+                mp_mfree(tmp);  
         }
-        tmp = itom(0);
-        mdiv(sk, modulus, tmp, sk);
-        mfree(tmp);
-        pow(root, sk, modulus, pk); 
-        xkey = mtox(sk);   
+        tmp = mp_itom(0);
+        mp_mdiv(sk, modulus, tmp, sk);
+        mp_mfree(tmp);
+        mp_pow(root, sk, modulus, pk); 
+        xkey = mp_mtox(sk);   
         adjust(secret, xkey);
-        xkey = mtox(pk);
+        xkey = mp_mtox(pk);
         adjust(public, xkey);
-        mfree(sk);
-        mfree(base);
-        mfree(pk);
-        mfree(root);
-        mfree(modulus);
+        mp_mfree(sk);
+        mp_mfree(base);
+        mp_mfree(pk);
+        mp_mfree(root);
+        mp_mfree(modulus);
 } 
 
 /*

==== //depot/projects/avr32/src/gnu/usr.bin/groff/tmac/mdoc.local#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.66 2008/12/13 16:13:37 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.67 2009/02/28 05:47:41 das Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -73,6 +73,10 @@
 .ds doc-operating-system-FreeBSD-7.1    7.1
 .ds doc-operating-system-FreeBSD-8.0    8.0
 .
+.\" Definitions not (yet) in doc-syms
+.ds doc-str-St--p1003.1-2008   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008
+.as doc-str-St--p1003.1-2008   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.
 .ec
 .
 .\" Locale support

==== //depot/projects/avr32/src/include/stdio.h#2 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.73 2008/05/07 15:12:45 jhb Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.74 2009/02/28 06:00:58 das Exp $
  */
 
 #ifndef	_STDIO_H_
@@ -51,6 +51,17 @@
 #define	_SIZE_T_DECLARED
 #endif
 
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
+#ifndef _OFF_T_DECLARED
+#define	_OFF_T_DECLARED
+typedef	__off_t		off_t;
+#endif
+#ifndef _SSIZE_T_DECLARED
+#define	_SSIZE_T_DECLARED
+typedef	__ssize_t	ssize_t;
+#endif
+#endif
+
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
 #ifndef _VA_LIST_DECLARED
 typedef	__va_list	va_list;
@@ -330,6 +341,34 @@
 char	*tempnam(const char *, const char *);
 #endif
 
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
+ssize_t	 getdelim(char ** __restrict, size_t * __restrict, int,
+	    FILE * __restrict);
+
+/*
+ * Every programmer and his dog wrote functions called getline()
+ * before POSIX.1-2008 came along and decided to usurp the name, so we
+ * don't prototype getline() by default unless one of the following is true:
+ *   a) the app has requested it specifically by defining _WITH_GETLINE
+ *   b) the app has requested a POSIX.1-2008 environment via _POSIX_C_SOURCE
+ *   c) the app defines a GNUism such as _BSD_SOURCE or _GNU_SOURCE
+ */
+#ifndef _WITH_GETLINE
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define	_WITH_GETLINE
+#elif defined(_POSIX_C_SOURCE)
+#if _POSIX_C_SOURCE > 200809
+#define	_WITH_GETLINE
+#endif
+#endif
+#endif
+
+#ifdef _WITH_GETLINE
+ssize_t	 getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
+#endif
+
+#endif /* __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 */
+
 /*
  * Routines that are purely local.
  */

==== //depot/projects/avr32/src/include/string.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)string.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/string.h,v 1.28 2009/01/31 18:27:02 das Exp $
+ * $FreeBSD: src/include/string.h,v 1.31 2009/02/28 06:00:58 das Exp $
  */
 
 #ifndef _STRING_H_
@@ -63,12 +63,15 @@
 int	 memcmp(const void *, const void *, size_t) __pure;
 void	*memcpy(void * __restrict, const void * __restrict, size_t);
 #if __BSD_VISIBLE
-void	*memmem(const void *, size_t, const void *, size_t);
+void	*memmem(const void *, size_t, const void *, size_t) __pure;
 #endif
 void	*memmove(void *, const void *, size_t);
 void	*memset(void *, int, size_t);
+#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
+char	*stpcpy(char * __restrict, const char * __restrict);
+char	*stpncpy(char * __restrict, const char * __restrict, size_t);
+#endif
 #if __BSD_VISIBLE
-char	*stpcpy(char *, const char *);
 char	*strcasestr(const char *, const char *) __pure;
 #endif
 char	*strcat(char * __restrict, const char * __restrict);
@@ -85,8 +88,8 @@
 int	 strerror_r(int, char *, size_t);
 #endif
 #if __BSD_VISIBLE
-size_t	 strlcat(char *, const char *, size_t);
-size_t	 strlcpy(char *, const char *, size_t);
+size_t	 strlcat(char * __restrict, const char * __restrict, size_t);
+size_t	 strlcpy(char * __restrict, const char * __restrict, size_t);
 #endif
 size_t	 strlen(const char *) __pure;
 #if __BSD_VISIBLE
@@ -95,14 +98,19 @@
 char	*strncat(char * __restrict, const char * __restrict, size_t);
 int	 strncmp(const char *, const char *, size_t) __pure;
 char	*strncpy(char * __restrict, const char * __restrict, size_t);
+#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
+char	*strndup(const char *, size_t) __malloc_like;
+size_t	 strnlen(const char *, size_t) __pure;
+#endif
 #if __BSD_VISIBLE
-char	*strndup(const char *, size_t) __malloc_like;
 char	*strnstr(const char *, const char *, size_t) __pure;
 #endif
 char	*strpbrk(const char *, const char *) __pure;
 char	*strrchr(const char *, int) __pure;
 #if __BSD_VISIBLE
 char	*strsep(char **, const char *);
+#endif
+#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
 char	*strsignal(int);
 #endif
 size_t	 strspn(const char *, const char *) __pure;

==== //depot/projects/avr32/src/include/wchar.h#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/include/wchar.h,v 1.47 2009/01/31 18:27:02 das Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.48 2009/02/28 06:00:58 das Exp $
  */
 
 /*-
@@ -210,13 +210,19 @@
 #define	wcwidth(_c)	__wcwidth(_c)
 #endif
 
-#if __BSD_VISIBLE
-wchar_t	*fgetwln(struct __sFILE * __restrict, size_t * __restrict);
+#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
 size_t	mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
 	    size_t, mbstate_t * __restrict);
 wchar_t	*wcsdup(const wchar_t *) __malloc_like;
+int	wcscasecmp(const wchar_t *, const wchar_t *);
+int	wcsncasecmp(const wchar_t *, const wchar_t *, size_t n);
+size_t	wcsnlen(const wchar_t *, size_t) __pure;
 size_t	wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
 	    size_t, mbstate_t * __restrict);
+#endif
+
+#if __BSD_VISIBLE
+wchar_t	*fgetwln(struct __sFILE * __restrict, size_t * __restrict);
 size_t	wcslcat(wchar_t *, const wchar_t *, size_t);
 size_t	wcslcpy(wchar_t *, const wchar_t *, size_t);
 #endif

==== //depot/projects/avr32/src/lib/libc/stdio/Makefile.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.39 2008/06/29 21:52:40 das Exp $
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.40 2009/02/28 06:00:58 das Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/stdio
@@ -10,8 +10,8 @@
 	fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \
 	fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \
 	ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \
-	fwrite.c getc.c \
-	getchar.c gets.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \
+	fwrite.c getc.c getchar.c getdelim.c getline.c \
+	gets.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \
 	perror.c printf.c printf-pos.c putc.c putchar.c \
 	puts.c putw.c putwc.c putwchar.c \
 	refill.c remove.c rewind.c rget.c scanf.c setbuf.c setbuffer.c \
@@ -33,7 +33,8 @@
 MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
 	flockfile.3 \
 	fopen.3 fputs.3 \
-	fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \
+	fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 \
+	getline.3 getwc.3 mktemp.3 \
 	printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \
 	ungetc.3 ungetwc.3 wprintf.3 wscanf.3
 
@@ -53,6 +54,7 @@
 MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3
 MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 getchar.3 \
 	getc.3 getchar_unlocked.3 getc.3 getw.3
+MLINKS+=getline.3 getdelim.3
 MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3
 MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3
 MLINKS+=printf.3 asprintf.3 printf.3 fprintf.3 \

==== //depot/projects/avr32/src/lib/libc/stdio/Symbol.map#2 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.8 2008/05/05 16:14:02 jhb Exp $
+ * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.9 2009/02/28 06:00:58 das Exp $
  */
 
 FBSD_1.0 {
@@ -110,6 +110,11 @@
 	wscanf;
 };
 
+FBSD_1.1 {
+	 getdelim;
+	 getline;
+};
+
 FBSDprivate_1.0 {
 	_flockfile;
 	_flockfile_debug_stub;

==== //depot/projects/avr32/src/lib/libc/stdio/fgetln.3#2 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.9 2007/01/09 00:28:06 imp Exp $
+.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.10 2009/02/28 06:00:58 das Exp $
 .\"
 .Dd April 19, 1994
 .Dt FGETLN 3
@@ -116,6 +116,7 @@
 .Xr fgets 3 ,
 .Xr fgetwln 3 ,
 .Xr fopen 3 ,
+.Xr getline 3 ,
 .Xr putc 3
 .Sh HISTORY
 The

==== //depot/projects/avr32/src/lib/libc/stdio/fgets.3#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdio/fgets.3,v 1.21 2007/01/09 00:28:06 imp Exp $
+.\" $FreeBSD: src/lib/libc/stdio/fgets.3,v 1.22 2009/02/28 06:00:58 das Exp $
 .\"
 .Dd June 4, 1993
 .Dt FGETS 3
@@ -147,7 +147,8 @@
 .Xr feof 3 ,
 .Xr ferror 3 ,
 .Xr fgetln 3 ,
-.Xr fgetws 3
+.Xr fgetws 3 ,
+.Xr getline 3
 .Sh STANDARDS
 The functions
 .Fn fgets

==== //depot/projects/avr32/src/lib/libc/stdio/printf-pos.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/printf-pos.c,v 1.4 2008/06/29 23:46:06 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/printf-pos.c,v 1.5 2009/02/28 04:58:18 das Exp $");
 
 /*
  * This is the code responsible for handling positional arguments
@@ -61,7 +61,7 @@
 enum typeid {
 	T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT,
 	T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
-	T_PTRDIFFT, TP_PTRDIFFT, T_SIZET, TP_SIZET,
+	T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SIZET,
 	T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
 	T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
 };
@@ -145,7 +145,7 @@
 	if (flags & INTMAXT)
 		types->table[types->nextarg++] = T_INTMAXT;
 	else if (flags & SIZET)
-		types->table[types->nextarg++] = T_SIZET;
+		types->table[types->nextarg++] = T_SSIZET;
 	else if (flags & PTRDIFFT)
 		types->table[types->nextarg++] = T_PTRDIFFT;
 	else if (flags & LLONGINT)
@@ -168,7 +168,7 @@
 	else if (flags & SIZET)
 		types->table[types->nextarg++] = T_SIZET;
 	else if (flags & PTRDIFFT)
-		types->table[types->nextarg++] = T_PTRDIFFT;
+		types->table[types->nextarg++] = T_SIZET;
 	else if (flags & LLONGINT)
 		types->table[types->nextarg++] = T_U_LLONG;
 	else if (flags & LONGINT)
@@ -716,6 +716,9 @@
 		    case T_SIZET:
 			(*argtable) [n].sizearg = va_arg (ap, size_t);
 			break;
+		    case T_SSIZET:
+			(*argtable) [n].sizearg = va_arg (ap, ssize_t);
+			break;
 		    case TP_SIZET:
 			(*argtable) [n].psizearg = va_arg (ap, size_t *);
 			break;

==== //depot/projects/avr32/src/lib/libc/stdio/stdio.3#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stdio.3	8.7 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/stdio/stdio.3,v 1.28 2007/01/09 00:28:07 imp Exp $
+.\" $FreeBSD: src/lib/libc/stdio/stdio.3,v 1.29 2009/02/28 06:00:58 das Exp $
 .\"
-.Dd January 10, 2003
+.Dd February 28, 2009
 .Dt STDIO 3
 .Os
 .Sh NAME
@@ -276,6 +276,8 @@
 .It "fwrite	binary stream input/output"
 .It "getc	get next character or word from input stream"
 .It "getchar	get next character or word from input stream"
+.It "getdelim	get a line from a stream"
+.It "getline	get a line from a stream"
 .It "gets	get a line from a stream"
 .It "getw	get next character or word from input stream"
 .It "getwc	get next wide character from input stream"


>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list