PERFORCE change 163101 for review
Arnar Mar Sig
antab at FreeBSD.org
Sat May 30 17:34:44 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=163101
Change 163101 by antab at antab_farm on 2009/05/30 17:34:25
IFC @ 163088
Affected files ...
.. //depot/projects/avr32/src/UPDATING#9 integrate
.. //depot/projects/avr32/src/bin/cp/utils.c#2 integrate
.. //depot/projects/avr32/src/bin/rm/rm.c#3 integrate
.. //depot/projects/avr32/src/contrib/ipfilter/lib/load_http.c#2 integrate
.. //depot/projects/avr32/src/contrib/netcat/nc.1#2 integrate
.. //depot/projects/avr32/src/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/avr32/src/lib/libarchive/Makefile#6 integrate
.. //depot/projects/avr32/src/lib/libc/net/resolver.3#2 integrate
.. //depot/projects/avr32/src/lib/libc/resolv/res_comp.c#2 integrate
.. //depot/projects/avr32/src/lib/libusb/libusb.3#4 integrate
.. //depot/projects/avr32/src/lib/libusb/libusb20.c#2 integrate
.. //depot/projects/avr32/src/lib/libusb/libusb20.h#2 integrate
.. //depot/projects/avr32/src/lib/libusb/libusb20_int.h#2 integrate
.. //depot/projects/avr32/src/lib/libusb/libusb20_ugen20.c#2 integrate
.. //depot/projects/avr32/src/lib/libusbhid/descr.c#4 integrate
.. //depot/projects/avr32/src/sbin/dump/optr.c#3 integrate
.. //depot/projects/avr32/src/sbin/fsck_ffs/fsck.h#3 integrate
.. //depot/projects/avr32/src/sbin/mksnap_ffs/Makefile#2 integrate
.. //depot/projects/avr32/src/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate
.. //depot/projects/avr32/src/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate
.. //depot/projects/avr32/src/share/man/man9/Makefile#6 integrate
.. //depot/projects/avr32/src/share/man/man9/VOP_ACCESS.9#3 integrate
.. //depot/projects/avr32/src/share/man/man9/rmlock.9#2 integrate
.. //depot/projects/avr32/src/share/man/man9/sx.9#2 integrate
.. //depot/projects/avr32/src/sys/amd64/amd64/dump_machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/amd64/amd64/minidump_machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/arm/arm/dump_machdep.c#3 integrate
.. //depot/projects/avr32/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate
.. //depot/projects/avr32/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate
.. //depot/projects/avr32/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate
.. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate
.. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate
.. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate
.. //depot/projects/avr32/src/sys/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/avr32/src/sys/compat/ndis/subr_usbd.c#6 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_ioctl.c#3 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_misc.c#4 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_resource.c#2 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_signal.c#2 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_socket.c#2 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_stat.c#3 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_stream.c#2 integrate
.. //depot/projects/avr32/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate
.. //depot/projects/avr32/src/sys/conf/NOTES#8 integrate
.. //depot/projects/avr32/src/sys/conf/files#11 integrate
.. //depot/projects/avr32/src/sys/conf/files.i386#7 integrate
.. //depot/projects/avr32/src/sys/conf/options#7 integrate
.. //depot/projects/avr32/src/sys/ddb/db_textdump.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/ata/ata-usb.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/bwi/if_bwi.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/cfe/cfe_console.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/dc/if_dc.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/dcons/dcons_os.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/e1000/if_em.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/firewire/firewire.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/firewire/if_fwe.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/firewire/if_fwip.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/fxp/if_fxp.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndisvar.h#5 integrate
.. //depot/projects/avr32/src/sys/dev/iwn/if_iwn.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/ixgb/if_ixgb.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/lmc/if_lmc.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/mge/if_mge.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/nfe/if_nfe.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/nmdm/nmdm.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/ral/rt2560.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/rp/rp.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/sf/if_sf.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/si/si.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/sis/if_sis.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/smc/if_smc.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/ste/if_ste.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/syscons/syscons.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/syscons/sysmouse.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/tsec/if_tsec.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.h#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.h#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/avr32dci.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/avr32dci.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.h#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.h#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.h#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.h#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/usb_controller.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.h#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/input/uhid.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/input/ukbd.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/input/ums.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/misc/udbp.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/misc/ufm.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/if_aue.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/if_axe.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/if_cdce.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/if_cue.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/if_kue.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/if_rue.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/if_udav.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/usb_ethernet.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/net/usb_ethernet.h#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/u3g.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uark.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/ubsa.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/ubser.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uchcom.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/ucycom.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/ufoma.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uftdi.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/ugensa.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uipaq.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/ulpt.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/umct.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/umodem.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/umoscom.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uplcom.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/usb_serial.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uslcom.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uvisor.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uvscom.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/storage/umass.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/storage/urio.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/storage/ustorage_fs.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/template/usb_template.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_bus.h#7 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_busdma.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_busdma.h#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_compat_linux.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_compat_linux.h#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_controller.h#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_core.h#7 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_dev.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_dev.h#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_device.c#7 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_device.h#7 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_dynamic.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_dynamic.h#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_error.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_generic.c#7 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_handle_request.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_hid.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_hid.h#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_hub.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_hub.h#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_lookup.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_lookup.h#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_mbuf.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_mbuf.h#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_msctest.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_msctest.h#3 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_process.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_process.h#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_request.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_request.h#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.h#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usb_util.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rum.c#7 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uath.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_upgt.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_ural.c#7 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_urtw.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zyd.c#7 integrate
.. //depot/projects/avr32/src/sys/dev/vge/if_vge.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/vr/if_vr.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/xen/console/console.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/xl/if_xl.c#4 integrate
.. //depot/projects/avr32/src/sys/fs/cd9660/cd9660_rrip.c#3 integrate
.. //depot/projects/avr32/src/sys/fs/nfs/nfsport.h#3 integrate
.. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate
.. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate
.. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate
.. //depot/projects/avr32/src/sys/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/avr32/src/sys/fs/smbfs/smbfs_io.c#4 integrate
.. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_create.c#2 integrate
.. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate
.. //depot/projects/avr32/src/sys/i386/i386/dump_machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/i386/i386/minidump_machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate
.. //depot/projects/avr32/src/sys/i386/include/xen/xen_clock_util.h#1 branch
.. //depot/projects/avr32/src/sys/i386/xen/clock.c#4 integrate
.. //depot/projects/avr32/src/sys/i386/xen/mp_machdep.c#6 integrate
.. //depot/projects/avr32/src/sys/i386/xen/xen_clock_util.c#1 branch
.. //depot/projects/avr32/src/sys/i386/xen/xen_rtc.c#2 integrate
.. //depot/projects/avr32/src/sys/ia64/ia64/dump_machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/ia64/ia64/ssc.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/kern_jail.c#6 integrate
.. //depot/projects/avr32/src/sys/kern/kern_mib.c#5 integrate
.. //depot/projects/avr32/src/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/avr32/src/sys/kern/kern_osd.c#4 integrate
.. //depot/projects/avr32/src/sys/kern/kern_rmlock.c#4 integrate
.. //depot/projects/avr32/src/sys/kern/kern_rwlock.c#5 integrate
.. //depot/projects/avr32/src/sys/kern/kern_shutdown.c#3 integrate
.. //depot/projects/avr32/src/sys/kern/kern_sx.c#4 integrate
.. //depot/projects/avr32/src/sys/kern/kern_xxx.c#2 integrate
.. //depot/projects/avr32/src/sys/kern/tty.c#8 integrate
.. //depot/projects/avr32/src/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/avr32/src/sys/kern/vfs_bio.c#7 integrate
.. //depot/projects/avr32/src/sys/kern/vfs_default.c#5 integrate
.. //depot/projects/avr32/src/sys/kern/vfs_lookup.c#6 integrate
.. //depot/projects/avr32/src/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/avr32/src/sys/kern/vnode_if.src#4 integrate
.. //depot/projects/avr32/src/sys/kgssapi/gsstest.c#3 integrate
.. //depot/projects/avr32/src/sys/modules/Makefile#8 integrate
.. //depot/projects/avr32/src/sys/modules/nfscl/Makefile#1 branch
.. //depot/projects/avr32/src/sys/modules/nfscommon/Makefile#1 branch
.. //depot/projects/avr32/src/sys/modules/nfsd/Makefile#1 branch
.. //depot/projects/avr32/src/sys/net/if.h#5 integrate
.. //depot/projects/avr32/src/sys/net/if_var.h#6 integrate
.. //depot/projects/avr32/src/sys/net/pfil.h#2 integrate
.. //depot/projects/avr32/src/sys/net80211/ieee80211_phy.h#2 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/avr32/src/sys/netinet/sctp_uio.h#5 integrate
.. //depot/projects/avr32/src/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/avr32/src/sys/netinet6/icmp6.c#6 integrate
.. //depot/projects/avr32/src/sys/netinet6/in6_ifattach.c#7 integrate
.. //depot/projects/avr32/src/sys/nfsclient/bootp_subr.c#4 integrate
.. //depot/projects/avr32/src/sys/nfsclient/nfs_bio.c#5 integrate
.. //depot/projects/avr32/src/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/avr32/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate
.. //depot/projects/avr32/src/sys/nlm/nlm_advlock.c#4 integrate
.. //depot/projects/avr32/src/sys/pci/if_rl.c#3 integrate
.. //depot/projects/avr32/src/sys/rpc/authunix_prot.c#2 integrate
.. //depot/projects/avr32/src/sys/security/mac/mac_framework.c#5 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/avr32/src/sys/sys/jail.h#6 integrate
.. //depot/projects/avr32/src/sys/sys/kernel.h#4 integrate
.. //depot/projects/avr32/src/sys/sys/mount.h#5 integrate
.. //depot/projects/avr32/src/sys/sys/namei.h#3 integrate
.. //depot/projects/avr32/src/sys/sys/param.h#9 integrate
.. //depot/projects/avr32/src/sys/sys/priv.h#5 integrate
.. //depot/projects/avr32/src/sys/sys/rmlock.h#2 integrate
.. //depot/projects/avr32/src/sys/sys/sx.h#3 integrate
.. //depot/projects/avr32/src/sys/sys/tty.h#3 integrate
.. //depot/projects/avr32/src/sys/sys/vimage.h#7 integrate
.. //depot/projects/avr32/src/sys/sys/vnode.h#5 integrate
.. //depot/projects/avr32/src/sys/xen/evtchn/evtchn.c#4 integrate
.. //depot/projects/avr32/src/usr.bin/Makefile#5 edit
.. //depot/projects/avr32/src/usr.bin/find/function.c#3 integrate
.. //depot/projects/avr32/src/usr.bin/perror/perror.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/jail/jail.8#4 integrate
.. //depot/projects/avr32/src/usr.sbin/mountd/mountd.8#3 integrate
.. //depot/projects/avr32/src/usr.sbin/mountd/mountd.c#3 integrate
.. //depot/projects/avr32/src/usr.sbin/nfscbd/nfscbd.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/nfsd/nfsd.8#3 integrate
.. //depot/projects/avr32/src/usr.sbin/nfsd/nfsd.c#3 integrate
.. //depot/projects/avr32/src/usr.sbin/nfsdumpstate/nfsdumpstate.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/nfsrevoke/nfsrevoke.c#2 integrate
.. //depot/projects/avr32/src/usr.sbin/nfsuserd/Makefile#2 integrate
.. //depot/projects/avr32/src/usr.sbin/nfsuserd/nfsuserd.c#2 integrate
Differences ...
==== //depot/projects/avr32/src/UPDATING#9 (text+ko) ====
@@ -22,6 +22,23 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090530:
+ Add VOP_ACCESSX(9). File system modules need to be rebuilt.
+ Bump __FreeBSD_version to 800094.
+
+20090529:
+ Add mnt_xflag field to 'struct mount'. File system modules
+ need to be rebuilt.
+ Bump __FreeBSD_version to 800093.
+
+20090528:
+ The compiling option ADAPTIVE_SX has been retired while it has been
+ introduced the option NO_ADAPTIVE_SX which handles the reversed logic.
+ The KPI for sx_init_flags() changes as accepting flags:
+ SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag
+ has been introduced in order to handle the reversed logic.
+ Bump __FreeBSD_version to 800092.
+
20090527:
Add support for hierarchical jails. Remove global securelevel.
Bump __FreeBSD_version to 800091.
@@ -1539,4 +1556,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.605 2009/05/27 14:11:23 jamie Exp $
+$FreeBSD: src/UPDATING,v 1.609 2009/05/30 14:01:01 trasz Exp $
==== //depot/projects/avr32/src/bin/cp/utils.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.58 2009/05/30 10:36:14 jilles Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -365,7 +365,7 @@
if (!gotstat || fs->st_flags != ts.st_flags)
if (fdval ?
fchflags(fd, fs->st_flags) :
- (islink ? (errno = ENOSYS) :
+ (islink ? lchflags(to.p_path, fs->st_flags) :
chflags(to.p_path, fs->st_flags))) {
warn("chflags: %s", to.p_path);
rval = 1;
==== //depot/projects/avr32/src/bin/rm/rm.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.59 2009/04/29 18:08:18 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.60 2009/05/30 10:42:37 jilles Exp $");
#include <sys/stat.h>
#include <sys/param.h>
@@ -234,7 +234,7 @@
else if (!uid &&
(p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
!(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) &&
- chflags(p->fts_accpath,
+ lchflags(p->fts_accpath,
p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0)
goto err;
continue;
@@ -253,7 +253,7 @@
if (!uid &&
(p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
!(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)))
- rval = chflags(p->fts_accpath,
+ rval = lchflags(p->fts_accpath,
p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE));
if (rval == 0) {
/*
@@ -368,7 +368,7 @@
if (!uid && !S_ISWHT(sb.st_mode) &&
(sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
!(sb.st_flags & (SF_APPEND|SF_IMMUTABLE)))
- rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
+ rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));
if (rval == 0) {
if (S_ISWHT(sb.st_mode))
rval = undelete(f);
==== //depot/projects/avr32/src/contrib/ipfilter/lib/load_http.c#2 (text+ko) ====
@@ -14,11 +14,13 @@
alist_t *
load_http(char *url)
{
- int fd, len, left, port, endhdr, removed;
- char *s, *t, *u, buffer[1024], *myurl;
+ char *s, *t, *u, buffer[1044], *myurl;
alist_t *a, *rtop, *rbot;
struct sockaddr_in sin;
struct hostent *host;
+ size_t avail;
+ int fd, len, left, port, endhdr, removed;
+ int error;
/*
* More than this would just be absurd.
@@ -32,7 +34,14 @@
rtop = NULL;
rbot = NULL;
- sprintf(buffer, "GET %s HTTP/1.0\r\n", url);
+ avail = sizeof(buffer);
+ error = snprintf(buffer, avail, "GET %s HTTP/1.0\r\n", url);
+
+ /*
+ * error is always less then avail due to the constraint on
+ * the url length above.
+ */
+ avail -= error;
myurl = strdup(url);
if (myurl == NULL)
@@ -51,7 +60,11 @@
if (u != NULL)
s = u + 1; /* AUTH */
- sprintf(buffer + strlen(buffer), "Host: %s\r\n\r\n", s);
+ error = snprintf(buffer + strlen(buffer), avail, "Host: %s\r\n\r\n", s);
+ if (error >= avail) {
+ fprintf(stderr, "URL is too large: %s\n", url);
+ goto done;
+ }
u = strchr(s, ':');
if (u != NULL) {
@@ -83,16 +96,12 @@
if (fd == -1)
goto done;
- if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
- close(fd);
+ if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1)
goto done;
- }
len = strlen(buffer);
- if (write(fd, buffer, len) != len) {
- close(fd);
+ if (write(fd, buffer, len) != len)
goto done;
- }
s = buffer;
endhdr = 0;
==== //depot/projects/avr32/src/contrib/netcat/nc.1#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $
+.\" $OpenBSD: nc.1,v 1.48 2008/09/19 13:24:41 sobrado Exp $
.\"
.\" Copyright (c) 1996 David Sacerdote
.\" All rights reserved.
@@ -25,7 +25,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/contrib/netcat/nc.1,v 1.11 2008/12/19 23:00:23 delphij Exp $
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.13 2009/05/29 07:18:31 delphij Exp $
.\"
.Dd $Mdocdate: May 6 2008 $
.Dt NC 1
@@ -53,7 +53,7 @@
.Ar port Oc Oc
.Xc
.Op Ar hostname
-.Op Ar port Ns Bq Ar s
+.Op Ar port
.Ek
.Sh DESCRIPTION
The
@@ -275,8 +275,8 @@
option is given
(in which case the local host is used).
.Pp
-.Ar port Ns Op Ar s
-can be single integers or ranges.
+.Ar port
+can be a single integer or a range of ports.
Ranges are in the form nn-mm.
In general,
a destination port must be specified,
@@ -445,6 +445,8 @@
if the proxy requires it:
.Pp
.Dl $ nc -x10.2.3.4:8080 -Xconnect -Pruser host.example.com 42
+.Sh EXIT STATUS
+.Ex -std
.Sh SEE ALSO
.Xr cat 1 ,
.Xr ssh 1 ,
==== //depot/projects/avr32/src/contrib/netcat/netcat.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */
+/* $OpenBSD: netcat.c,v 1.92 2008/09/19 13:24:41 sobrado Exp $ */
/*
* Copyright (c) 2001 Eric Jackson <ericj at monkey.org>
*
@@ -25,7 +25,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/contrib/netcat/netcat.c,v 1.9 2008/12/19 23:00:23 delphij Exp $
+ * $FreeBSD: src/contrib/netcat/netcat.c,v 1.10 2009/05/28 23:23:49 delphij Exp $
*/
/*
@@ -967,14 +967,15 @@
void
usage(int ret)
{
+ fprintf(stderr,
#ifdef IPSEC
- fprintf(stderr, "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I receive_buffer_len] [-i interval]\n");
+ "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I length] [-i interval] [-O length]\n"
#else
- fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-I receive_buffer_len] [-i interval]\n");
+ "usage: nc [-46DdhklnorStUuvz] [-I length] [-i interval] [-O length]\n"
#endif
- fprintf(stderr, "\t [-O send_buffer_len] [-P proxy_username] [-p source_port]\n");
- fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
- fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n");
+ "\t [-P proxy_username] [-p source_port] [-s source_ip_address] [-T ToS]\n"
+ "\t [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]] [hostname]\n"
+ "\t [port]\n");
if (ret)
exit(1);
}
==== //depot/projects/avr32/src/lib/libarchive/Makefile#6 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.95 2009/04/27 22:39:43 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.96 2009/05/30 07:08:16 kientzle Exp $
.include <bsd.own.mk>
LIB= archive
DPADD= ${LIBBZ2} ${LIBZ}
-LDADD= -lbz2 -lz
+LDADD= -lbz2 -lz -lmd
# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
# It has no real relation to the libarchive version number.
@@ -17,6 +17,7 @@
.if ${MK_OPENSSL} != "no"
CFLAGS+= -DWITH_OPENSSL
+LDFLAGS+= -lcrypto
.endif
==== //depot/projects/avr32/src/lib/libc/net/resolver.3#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)resolver.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.33 2007/01/09 00:28:02 imp Exp $
+.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.34 2009/05/29 07:55:44 delphij Exp $
.\"
-.Dd November 4, 2006
+.Dd May 29, 2009
.Dt RESOLVER 3
.Os
.Sh NAME
@@ -401,6 +401,19 @@
.Va _res
structure in an attempt to replace the per-thread version referred to
by that macro.
+.Pp
+The following compile-time option can be specified to change the default
+behavior of resolver routines when necessary.
+.Bl -tag -width RES_ENFORCE_RFC1034
+.It Dv RES_ENFORCE_RFC1034
+If this symbol is defined during compile-time,
+.Fn res_search
+will enforce RFC 1034 check, namely, disallow using of underscore character
+within host names.
+This is used by the standard host lookup routines like
+.Xr gethostbyname 3 .
+For compatibility reasons this option is not enabled by default.
+.El
.Sh RETURN VALUES
The
.Fn res_init
==== //depot/projects/avr32/src/lib/libc/resolv/res_comp.c#2 (text) ====
@@ -69,7 +69,7 @@
static const char rcsid[] = "$Id: res_comp.c,v 1.3.18.2 2005/07/28 07:38:11 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_comp.c,v 1.5 2008/02/16 00:16:49 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_comp.c,v 1.6 2009/05/29 07:34:54 delphij Exp $");
#include "port_before.h"
#include <sys/types.h>
@@ -148,7 +148,11 @@
#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
#define borderchar(c) (alphachar(c) || digitchar(c))
+#ifdef RES_ENFORCE_RFC1034
+#define middlechar(c) (borderchar(c) || hyphenchar(c))
+#else
#define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c))
+#endif
#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)
int
==== //depot/projects/avr32/src/lib/libusb/libusb.3#4 (text+ko) ====
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.3 2009/05/21 17:16:35 thompsa Exp $
+.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.4 2009/05/28 17:36:36 thompsa Exp $
.\"
.Dd May 21, 2009
.Dt LIBUSB 3
@@ -109,7 +109,7 @@
.Ft const char *
.Fn libusb20_dev_get_backend_name "struct libusb20_device *"
.Ft int
-.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb2_device_info *pinfo"
+.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb_device_info *pinfo"
.Ft int
.Fn libusb20_dev_get_iface_desc "struct libusb20_device *pdev" "uint8_t iface_index" "char *buf" "uint8_t len"
.Ft const char *
@@ -465,7 +465,7 @@
.Pp
.
.Fn libusb20_dev_get_info
-retrives the BSD specific usb2_device_info structure into the memory location given by
+retrives the BSD specific usb_device_info structure into the memory location given by
.Fa pinfo .
The USB device given by
.Fa pdev
==== //depot/projects/avr32/src/lib/libusb/libusb20.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -925,7 +925,7 @@
int
libusb20_dev_get_info(struct libusb20_device *pdev,
- struct usb2_device_info *pinfo)
+ struct usb_device_info *pinfo)
{
if (pinfo == NULL)
return (LIBUSB20_ERROR_INVALID_PARAM);
==== //depot/projects/avr32/src/lib/libusb/libusb20.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.2 2009/03/17 21:20:39 delphij Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.3 2009/05/28 17:36:36 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
* Copyright (c) 2007-2008 Daniel Drake. All rights reserved.
@@ -175,7 +175,7 @@
LIBUSB20_POWER_RESUME,
};
-struct usb2_device_info;
+struct usb_device_info;
struct libusb20_transfer;
struct libusb20_backend;
struct libusb20_backend_methods;
@@ -253,7 +253,7 @@
int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode);
uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev);
int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index);
-int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo);
+int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb_device_info *pinfo);
int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len);
struct LIBUSB20_DEVICE_DESC_DECODED *libusb20_dev_get_device_desc(struct libusb20_device *pdev);
==== //depot/projects/avr32/src/lib/libusb/libusb20_int.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -49,7 +49,7 @@
typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
typedef int (libusb20_close_device_t)(struct libusb20_device *pdev);
-typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_device_info *pinfo);
+typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb_device_info *pinfo);
typedef int (libusb20_dev_get_iface_desc_t)(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len);
typedef int (libusb20_init_backend_t)(struct libusb20_backend *pbe);
typedef int (libusb20_open_device_t)(struct libusb20_device *pdev, uint16_t transfer_count_max);
==== //depot/projects/avr32/src/lib/libusb/libusb20_ugen20.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -126,8 +126,8 @@
ugen20_enumerate(struct libusb20_device *pdev, const char *id)
{
const char *tmp = id;
- struct usb2_device_descriptor ddesc;
- struct usb2_device_info devinfo;
+ struct usb_device_descriptor ddesc;
+ struct usb_device_info devinfo;
uint32_t plugtime;
char buf[64];
int f;
@@ -213,7 +213,7 @@
}
struct ugen20_urd_state {
- struct usb2_read_dir urd;
+ struct usb_read_dir urd;
uint32_t nparsed;
int f;
uint8_t *ptr;
@@ -298,7 +298,7 @@
static void
ugen20_tr_release(struct libusb20_device *pdev)
{
- struct usb2_fs_uninit fs_uninit;
+ struct usb_fs_uninit fs_uninit;
if (pdev->nTransfer == 0) {
return;
@@ -316,8 +316,8 @@
static int
ugen20_tr_renew(struct libusb20_device *pdev)
{
- struct usb2_fs_init fs_init;
- struct usb2_fs_endpoint *pfse;
+ struct usb_fs_init fs_init;
+ struct usb_fs_endpoint *pfse;
int error;
uint32_t size;
uint16_t nMaxTransfer;
@@ -419,7 +419,7 @@
static int
ugen20_close_device(struct libusb20_device *pdev)
{
- struct usb2_fs_uninit fs_uninit;
+ struct usb_fs_uninit fs_uninit;
if (pdev->privBeData) {
memset(&fs_uninit, 0, sizeof(fs_uninit));
@@ -447,8 +447,8 @@
ugen20_get_config_desc_full(struct libusb20_device *pdev,
uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index)
{
- struct usb2_gen_descriptor gen_desc;
- struct usb2_config_descriptor cdesc;
+ struct usb_gen_descriptor gen_desc;
+ struct usb_config_descriptor cdesc;
uint8_t *ptr;
uint16_t len;
int error;
@@ -542,7 +542,7 @@
ugen20_set_alt_index(struct libusb20_device *pdev,
uint8_t iface_index, uint8_t alt_index)
{
- struct usb2_alt_interface alt_iface;
+ struct usb_alt_interface alt_iface;
memset(&alt_iface, 0, sizeof(alt_iface));
@@ -663,7 +663,7 @@
struct LIBUSB20_CONTROL_SETUP_DECODED *setup,
void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags)
{
- struct usb2_ctl_request req;
+ struct usb_ctl_request req;
memset(&req, 0, sizeof(req));
@@ -688,8 +688,8 @@
static int
ugen20_process(struct libusb20_device *pdev)
{
- struct usb2_fs_complete temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_complete temp;
+ struct usb_fs_endpoint *fsep;
struct libusb20_transfer *xfer;
while (1) {
@@ -739,8 +739,8 @@
ugen20_tr_open(struct libusb20_transfer *xfer, uint32_t MaxBufSize,
uint32_t MaxFrameCount, uint8_t ep_no)
{
- struct usb2_fs_open temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_open temp;
+ struct usb_fs_endpoint *fsep;
memset(&temp, 0, sizeof(temp));
@@ -772,7 +772,7 @@
static int
ugen20_tr_close(struct libusb20_transfer *xfer)
{
- struct usb2_fs_close temp;
+ struct usb_fs_close temp;
memset(&temp, 0, sizeof(temp));
@@ -787,7 +787,7 @@
static int
ugen20_tr_clear_stall_sync(struct libusb20_transfer *xfer)
{
- struct usb2_fs_clear_stall_sync temp;
+ struct usb_fs_clear_stall_sync temp;
memset(&temp, 0, sizeof(temp));
@@ -804,8 +804,8 @@
static void
ugen20_tr_submit(struct libusb20_transfer *xfer)
{
- struct usb2_fs_start temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_start temp;
+ struct usb_fs_endpoint *fsep;
memset(&temp, 0, sizeof(temp));
@@ -839,7 +839,7 @@
static void
ugen20_tr_cancel_async(struct libusb20_transfer *xfer)
{
- struct usb2_fs_stop temp;
+ struct usb_fs_stop temp;
memset(&temp, 0, sizeof(temp));
@@ -876,7 +876,7 @@
ugen20_dev_get_iface_desc(struct libusb20_device *pdev,
uint8_t iface_index, char *buf, uint8_t len)
{
- struct usb2_gen_descriptor ugd;
+ struct usb_gen_descriptor ugd;
memset(&ugd, 0, sizeof(ugd));
@@ -892,7 +892,7 @@
static int
ugen20_dev_get_info(struct libusb20_device *pdev,
- struct usb2_device_info *pinfo)
+ struct usb_device_info *pinfo)
{
if (ioctl(pdev->file, USB_GET_DEVICEINFO, pinfo)) {
return (LIBUSB20_ERROR_INVALID_PARAM);
@@ -904,7 +904,7 @@
ugen20_root_get_dev_quirk(struct libusb20_backend *pbe,
uint16_t quirk_index, struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -931,7 +931,7 @@
ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t quirk_index,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -954,7 +954,7 @@
ugen20_root_add_dev_quirk(struct libusb20_backend *pbe,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -978,7 +978,7 @@
ugen20_root_remove_dev_quirk(struct libusb20_backend *pbe,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
==== //depot/projects/avr32/src/lib/libusbhid/descr.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.11 2009/02/27 15:30:42 thompsa Exp $");
+__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.12 2009/05/28 20:21:01 thompsa Exp $");
#include <sys/types.h>
@@ -76,7 +76,7 @@
report_desc_t
hid_get_report_desc(int fd)
{
- struct usb2_gen_descriptor ugd;
+ struct usb_gen_descriptor ugd;
report_desc_t rep;
void *data;
==== //depot/projects/avr32/src/sbin/dump/optr.c#3 (text+ko) ====
@@ -32,7 +32,7 @@
static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/dump/optr.c,v 1.36 2009/03/02 03:08:46 cy Exp $";
+ "$FreeBSD: src/sbin/dump/optr.c,v 1.37 2009/05/29 07:26:44 brian Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -406,7 +406,7 @@
};
if (arg != 'w' || dumpme)
(void) printf(
- "%c %8s\t(%6s) Last dump: Level %c, Date %s\n",
+ "%c %8s\t(%6s) Last dump: Level %d, Date %s\n",
dumpme && (arg != 'w') ? '>' : ' ',
dtwalk->dd_name,
dt ? dt->fs_file : "",
==== //depot/projects/avr32/src/sbin/fsck_ffs/fsck.h#3 (text+ko) ====
@@ -57,7 +57,7 @@
* SUCH DAMAGE.
*
* @(#)fsck.h 8.4 (Berkeley) 5/9/95
- * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.41 2009/02/04 01:02:56 mckusick Exp $
+ * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.42 2009/05/29 20:01:50 lulf Exp $
*/
#include <unistd.h>
@@ -297,8 +297,8 @@
ufs2_daddr_t n_blks; /* number of blocks in use */
ino_t n_files; /* number of files in use */
-int got_siginfo; /* received a SIGINFO */
-int got_sigalarm; /* received a SIGALRM */
+sig_atomic_t got_siginfo; /* received a SIGINFO */
+sig_atomic_t got_sigalarm; /* received a SIGALRM */
#define clearinode(dp) \
if (sblock.fs_magic == FS_UFS1_MAGIC) { \
==== //depot/projects/avr32/src/sbin/mksnap_ffs/Makefile#2 (text+ko) ====
@@ -1,8 +1,13 @@
-# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.1 2003/03/02 01:50:33 mckusick Exp $
+# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.2 2009/05/29 19:18:41 pjd Exp $
+
+.PATH: ${.CURDIR}/../mount
PROG= mksnap_ffs
+SRCS= mksnap_ffs.c getmntopts.c
MAN= mksnap_ffs.8
+CFLAGS+=-I${.CURDIR}/../mount
+
.if defined(NOSUID)
BINMODE=550
.else
==== //depot/projects/avr32/src/sbin/mksnap_ffs/mksnap_ffs.8#2 (text+ko) ====
@@ -32,9 +32,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.4 2008/07/26 13:18:33 kib Exp $
+.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.5 2009/05/29 19:18:41 pjd Exp $
.\"
-.Dd January 19, 2003
+.Dd May 29, 2009
.Dt MKSNAP_FFS 8
.Os
.Sh NAME
@@ -42,19 +42,12 @@
.Nd take a file system snapshot
.Sh SYNOPSIS
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list