svn commit: r250343 - in user/adrian/net80211_tx: bin/sh cddl/lib/drti contrib/binutils/binutils contrib/binutils/ld contrib/smbfs/lib/smb contrib/smbfs/mount_smbfs etc/rc.d kerberos5/lib/libgssapi...

Adrian Chadd adrian at FreeBSD.org
Wed May 8 00:58:25 UTC 2013 

Author: adrian
Date: Wed May  8 00:58:18 2013
New Revision: 250343
URL: http://svnweb.freebsd.org/changeset/base/250343

Log:
  Merge from HEAD.

Added:
  user/adrian/net80211_tx/tools/regression/bin/sh/builtins/read7.0
     - copied unchanged from r250342, head/tools/regression/bin/sh/builtins/read7.0
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.0.in
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.0.in
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.0.out
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.0.out
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.0I.out
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.0I.out
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.0J.out
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.0J.out
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.0L.out
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.0L.out
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.n1.out
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.n1.out
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.n2.out
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.n2.out
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.n3.out
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.n3.out
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.quotes.in
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.quotes.in
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.quotes.out
     - copied unchanged from r250342, head/tools/regression/usr.bin/xargs/regress.quotes.out
  user/adrian/net80211_tx/tools/tools/ath/athalq/txdiff.pl
     - copied unchanged from r250342, head/tools/tools/ath/athalq/txdiff.pl
  user/adrian/net80211_tx/usr.sbin/bsdconfig/packages/
     - copied from r250342, head/usr.sbin/bsdconfig/packages/
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/packages/
     - copied from r250342, head/usr.sbin/bsdconfig/share/packages/
Modified:
  user/adrian/net80211_tx/bin/sh/input.c
  user/adrian/net80211_tx/bin/sh/jobs.c
  user/adrian/net80211_tx/bin/sh/main.c
  user/adrian/net80211_tx/bin/sh/miscbltin.c
  user/adrian/net80211_tx/bin/sh/redir.c
  user/adrian/net80211_tx/bin/sh/sh.1
  user/adrian/net80211_tx/cddl/lib/drti/Makefile
  user/adrian/net80211_tx/contrib/binutils/binutils/arlex.l
  user/adrian/net80211_tx/contrib/binutils/ld/ldlex.l
  user/adrian/net80211_tx/contrib/smbfs/lib/smb/ctx.c
  user/adrian/net80211_tx/contrib/smbfs/mount_smbfs/mount_smbfs.c
  user/adrian/net80211_tx/etc/rc.d/ip6addrctl
  user/adrian/net80211_tx/etc/rc.d/mountlate
  user/adrian/net80211_tx/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
  user/adrian/net80211_tx/lib/clang/include/llvm/Config/config.h
  user/adrian/net80211_tx/lib/libc/gen/errlst.c
  user/adrian/net80211_tx/lib/libc/locale/duplocale.3
  user/adrian/net80211_tx/lib/libc/locale/freelocale.3
  user/adrian/net80211_tx/lib/libc/locale/newlocale.3
  user/adrian/net80211_tx/lib/libc/locale/querylocale.3
  user/adrian/net80211_tx/lib/libc/locale/uselocale.3
  user/adrian/net80211_tx/lib/libc/locale/xlocale.3
  user/adrian/net80211_tx/lib/libc/net/nslexer.l
  user/adrian/net80211_tx/lib/libc/nls/C.msg
  user/adrian/net80211_tx/lib/libc/sys/intro.2
  user/adrian/net80211_tx/lib/libipsec/policy_token.l
  user/adrian/net80211_tx/lib/libkvm/kvm.c
  user/adrian/net80211_tx/lib/libpmc/Makefile
  user/adrian/net80211_tx/lib/libprocstat/Symbol.map
  user/adrian/net80211_tx/lib/libprocstat/libprocstat.3
  user/adrian/net80211_tx/lib/libprocstat/libprocstat.c
  user/adrian/net80211_tx/lib/libprocstat/libprocstat.h
  user/adrian/net80211_tx/lib/libusb/Makefile
  user/adrian/net80211_tx/lib/libusb/libusb.3
  user/adrian/net80211_tx/lib/libusb/libusb.h
  user/adrian/net80211_tx/lib/libusb/libusb10.c
  user/adrian/net80211_tx/lib/libusb/libusb10_io.c
  user/adrian/net80211_tx/lib/libusb/libusb20.3
  user/adrian/net80211_tx/lib/libusb/libusb20.c
  user/adrian/net80211_tx/lib/libusb/libusb20.h
  user/adrian/net80211_tx/lib/libusb/libusb20_int.h
  user/adrian/net80211_tx/lib/libusb/libusb20_ugen20.c
  user/adrian/net80211_tx/lib/libz/ChangeLog
  user/adrian/net80211_tx/lib/libz/README
  user/adrian/net80211_tx/lib/libz/Symbol.map
  user/adrian/net80211_tx/lib/libz/Versions.def
  user/adrian/net80211_tx/lib/libz/compress.c
  user/adrian/net80211_tx/lib/libz/contrib/README.contrib
  user/adrian/net80211_tx/lib/libz/deflate.c
  user/adrian/net80211_tx/lib/libz/deflate.h
  user/adrian/net80211_tx/lib/libz/gzguts.h
  user/adrian/net80211_tx/lib/libz/gzlib.c
  user/adrian/net80211_tx/lib/libz/gzread.c
  user/adrian/net80211_tx/lib/libz/gzwrite.c
  user/adrian/net80211_tx/lib/libz/infback.c
  user/adrian/net80211_tx/lib/libz/inffast.c
  user/adrian/net80211_tx/lib/libz/inflate.c
  user/adrian/net80211_tx/lib/libz/inftrees.c
  user/adrian/net80211_tx/lib/libz/test/example.c
  user/adrian/net80211_tx/lib/libz/test/minigzip.c
  user/adrian/net80211_tx/lib/libz/trees.c
  user/adrian/net80211_tx/lib/libz/uncompr.c
  user/adrian/net80211_tx/lib/libz/zconf.h
  user/adrian/net80211_tx/lib/libz/zlib.3
  user/adrian/net80211_tx/lib/libz/zlib.h
  user/adrian/net80211_tx/lib/libz/zutil.c
  user/adrian/net80211_tx/lib/libz/zutil.h
  user/adrian/net80211_tx/release/picobsd/build/picobsd
  user/adrian/net80211_tx/sbin/devd/devd.cc
  user/adrian/net80211_tx/sbin/devd/token.l
  user/adrian/net80211_tx/sbin/iscontrol/auth_subr.c
  user/adrian/net80211_tx/sbin/iscontrol/fsm.c
  user/adrian/net80211_tx/sbin/iscontrol/login.c
  user/adrian/net80211_tx/sbin/iscontrol/misc.c
  user/adrian/net80211_tx/sbin/mount/mount.8
  user/adrian/net80211_tx/sbin/mount/mount.c
  user/adrian/net80211_tx/sbin/ping6/ping6.8
  user/adrian/net80211_tx/sbin/ping6/ping6.c
  user/adrian/net80211_tx/share/man/man4/man4.i386/npx.4
  user/adrian/net80211_tx/share/misc/bsd-family-tree
  user/adrian/net80211_tx/sys/amd64/include/param.h
  user/adrian/net80211_tx/sys/amd64/include/vmparam.h
  user/adrian/net80211_tx/sys/amd64/vmm/vmm_instruction_emul.c
  user/adrian/net80211_tx/sys/arm/arm/cpufunc_asm_pj4b.S
  user/adrian/net80211_tx/sys/arm/arm/db_trace.c
  user/adrian/net80211_tx/sys/arm/arm/exception.S
  user/adrian/net80211_tx/sys/arm/arm/locore.S
  user/adrian/net80211_tx/sys/arm/arm/mp_machdep.c
  user/adrian/net80211_tx/sys/arm/arm/pmap-v6.c
  user/adrian/net80211_tx/sys/arm/arm/swtch.S
  user/adrian/net80211_tx/sys/arm/arm/trap.c
  user/adrian/net80211_tx/sys/arm/include/param.h
  user/adrian/net80211_tx/sys/arm/include/pmap.h
  user/adrian/net80211_tx/sys/arm/include/vmparam.h
  user/adrian/net80211_tx/sys/arm/mv/armadaxp/armadaxp.c
  user/adrian/net80211_tx/sys/arm/mv/armadaxp/armadaxp_mp.c
  user/adrian/net80211_tx/sys/arm/mv/armadaxp/std.armadaxp
  user/adrian/net80211_tx/sys/arm/mv/common.c
  user/adrian/net80211_tx/sys/arm/mv/mv_machdep.c
  user/adrian/net80211_tx/sys/arm/mv/mvvar.h
  user/adrian/net80211_tx/sys/arm/mv/mvwin.h
  user/adrian/net80211_tx/sys/boot/fdt/dts/db78460.dts
  user/adrian/net80211_tx/sys/boot/pc98/libpc98/biosdisk.c
  user/adrian/net80211_tx/sys/cam/ata/ata_xpt.c
  user/adrian/net80211_tx/sys/cam/scsi/scsi_all.h
  user/adrian/net80211_tx/sys/cam/scsi/scsi_da.c
  user/adrian/net80211_tx/sys/conf/NOTES
  user/adrian/net80211_tx/sys/conf/options
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsinit.c
  user/adrian/net80211_tx/sys/contrib/octeon-sdk/cvmx-mgmt-port.c
  user/adrian/net80211_tx/sys/contrib/octeon-sdk/cvmx-mgmt-port.h
  user/adrian/net80211_tx/sys/dev/ahci/ahci.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath_sysctl.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath_tx.c
  user/adrian/net80211_tx/sys/dev/ath/if_athioctl.h
  user/adrian/net80211_tx/sys/dev/ath/if_athvar.h
  user/adrian/net80211_tx/sys/dev/bwn/if_bwn.c
  user/adrian/net80211_tx/sys/dev/cesa/cesa.c
  user/adrian/net80211_tx/sys/dev/cesa/cesa.h
  user/adrian/net80211_tx/sys/dev/cxgbe/t4_main.c
  user/adrian/net80211_tx/sys/dev/cxgbe/tom/t4_cpl_io.c
  user/adrian/net80211_tx/sys/dev/cxgbe/tom/t4_ddp.c
  user/adrian/net80211_tx/sys/dev/cxgbe/tom/t4_tom.h
  user/adrian/net80211_tx/sys/dev/hwpmc/hwpmc_core.c
  user/adrian/net80211_tx/sys/dev/mps/mps_mapping.c
  user/adrian/net80211_tx/sys/dev/netmap/if_em_netmap.h
  user/adrian/net80211_tx/sys/dev/netmap/if_re_netmap.h
  user/adrian/net80211_tx/sys/dev/netmap/netmap.c
  user/adrian/net80211_tx/sys/dev/netmap/netmap_mem2.c
  user/adrian/net80211_tx/sys/dev/qlxgb/README.txt
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_dbg.c
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_dbg.h
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_def.h
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_glbl.h
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_hw.c
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_hw.h
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_inline.h
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_ioctl.c
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_ioctl.h
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_isr.c
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_misc.c
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_os.c
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_os.h
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_reg.h
  user/adrian/net80211_tx/sys/dev/qlxgb/qla_ver.h
  user/adrian/net80211_tx/sys/dev/sound/pci/envy24ht.c
  user/adrian/net80211_tx/sys/dev/sound/pci/envy24ht.h
  user/adrian/net80211_tx/sys/dev/usb/template/usb_template.c
  user/adrian/net80211_tx/sys/dev/usb/usb_debug.h
  user/adrian/net80211_tx/sys/dev/usb/usb_device.c
  user/adrian/net80211_tx/sys/dev/usb/usb_device.h
  user/adrian/net80211_tx/sys/dev/usb/usb_dynamic.c
  user/adrian/net80211_tx/sys/dev/usb/usb_freebsd.h
  user/adrian/net80211_tx/sys/dev/usb/usb_freebsd_loader.h
  user/adrian/net80211_tx/sys/dev/usb/usb_generic.c
  user/adrian/net80211_tx/sys/dev/usb/usb_hub.c
  user/adrian/net80211_tx/sys/dev/usb/usb_hub.h
  user/adrian/net80211_tx/sys/dev/usb/usb_ioctl.h
  user/adrian/net80211_tx/sys/dev/usb/usb_parse.c
  user/adrian/net80211_tx/sys/dev/usb/usb_request.c
  user/adrian/net80211_tx/sys/dev/usb/usb_request.h
  user/adrian/net80211_tx/sys/fs/msdosfs/msdosfs_denode.c
  user/adrian/net80211_tx/sys/fs/msdosfs/msdosfs_vnops.c
  user/adrian/net80211_tx/sys/fs/smbfs/smbfs.h
  user/adrian/net80211_tx/sys/fs/smbfs/smbfs_io.c
  user/adrian/net80211_tx/sys/fs/smbfs/smbfs_vfsops.c
  user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs.h
  user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_subr.c
  user/adrian/net80211_tx/sys/fs/tmpfs/tmpfs_vnops.c
  user/adrian/net80211_tx/sys/geom/label/g_label_ntfs.c
  user/adrian/net80211_tx/sys/i386/include/param.h
  user/adrian/net80211_tx/sys/i386/include/vmparam.h
  user/adrian/net80211_tx/sys/ia64/include/param.h
  user/adrian/net80211_tx/sys/ia64/include/vmparam.h
  user/adrian/net80211_tx/sys/kern/kern_descrip.c
  user/adrian/net80211_tx/sys/kern/uipc_sem.c
  user/adrian/net80211_tx/sys/kern/uipc_socket.c
  user/adrian/net80211_tx/sys/kern/vfs_cluster.c
  user/adrian/net80211_tx/sys/kern/vfs_subr.c
  user/adrian/net80211_tx/sys/kern/vfs_vnops.c
  user/adrian/net80211_tx/sys/mips/cavium/octe/ethernet-common.c
  user/adrian/net80211_tx/sys/mips/cavium/octe/wrapper-cvmx-includes.h
  user/adrian/net80211_tx/sys/mips/include/param.h
  user/adrian/net80211_tx/sys/mips/include/vmparam.h
  user/adrian/net80211_tx/sys/net/if.c
  user/adrian/net80211_tx/sys/net/if_llatbl.c
  user/adrian/net80211_tx/sys/net/if_llatbl.h
  user/adrian/net80211_tx/sys/net/if_var.h
  user/adrian/net80211_tx/sys/netinet/icmp6.h
  user/adrian/net80211_tx/sys/netinet/in_pcb.h
  user/adrian/net80211_tx/sys/netinet/in_var.h
  user/adrian/net80211_tx/sys/netinet/ip_id.c
  user/adrian/net80211_tx/sys/netinet/ip_input.c
  user/adrian/net80211_tx/sys/netinet/tcp_subr.c
  user/adrian/net80211_tx/sys/netinet6/in6.c
  user/adrian/net80211_tx/sys/netinet6/in6_ifattach.c
  user/adrian/net80211_tx/sys/netinet6/in6_ifattach.h
  user/adrian/net80211_tx/sys/netinet6/in6_proto.c
  user/adrian/net80211_tx/sys/netpfil/ipfw/ip_fw2.c
  user/adrian/net80211_tx/sys/netpfil/pf/if_pfsync.c
  user/adrian/net80211_tx/sys/netpfil/pf/pf.c
  user/adrian/net80211_tx/sys/netsmb/smb_conn.c
  user/adrian/net80211_tx/sys/netsmb/smb_conn.h
  user/adrian/net80211_tx/sys/netsmb/smb_dev.c
  user/adrian/net80211_tx/sys/netsmb/smb_dev.h
  user/adrian/net80211_tx/sys/netsmb/smb_trantcp.c
  user/adrian/net80211_tx/sys/powerpc/include/param.h
  user/adrian/net80211_tx/sys/powerpc/include/vmparam.h
  user/adrian/net80211_tx/sys/powerpc/powermac/smu.c
  user/adrian/net80211_tx/sys/sparc64/include/param.h
  user/adrian/net80211_tx/sys/sparc64/include/vmparam.h
  user/adrian/net80211_tx/sys/sys/errno.h
  user/adrian/net80211_tx/sys/sys/ksem.h
  user/adrian/net80211_tx/sys/sys/socketvar.h
  user/adrian/net80211_tx/sys/sys/user.h
  user/adrian/net80211_tx/sys/vm/vm_mmap.c
  user/adrian/net80211_tx/sys/vm/vm_phys.c
  user/adrian/net80211_tx/sys/vm/vm_radix.c
  user/adrian/net80211_tx/sys/x86/acpica/srat.c
  user/adrian/net80211_tx/tools/regression/usr.bin/xargs/regress.sh
  user/adrian/net80211_tx/tools/tools/ath/athalq/Makefile
  user/adrian/net80211_tx/tools/tools/ath/athalq/ar9300_ds.c
  user/adrian/net80211_tx/tools/tools/ath/athalq/main.c
  user/adrian/net80211_tx/usr.bin/ar/acplex.l
  user/adrian/net80211_tx/usr.bin/calendar/calendars/calendar.dutch
  user/adrian/net80211_tx/usr.bin/csup/token.l
  user/adrian/net80211_tx/usr.bin/fstat/fstat.1
  user/adrian/net80211_tx/usr.bin/fstat/fstat.c
  user/adrian/net80211_tx/usr.bin/m4/TEST/ack.m4
  user/adrian/net80211_tx/usr.bin/m4/TEST/hanoi.m4
  user/adrian/net80211_tx/usr.bin/m4/TEST/hash.m4
  user/adrian/net80211_tx/usr.bin/m4/TEST/sqroot.m4
  user/adrian/net80211_tx/usr.bin/m4/TEST/string.m4
  user/adrian/net80211_tx/usr.bin/m4/TEST/test.m4
  user/adrian/net80211_tx/usr.bin/m4/eval.c
  user/adrian/net80211_tx/usr.bin/m4/extern.h
  user/adrian/net80211_tx/usr.bin/m4/m4.1
  user/adrian/net80211_tx/usr.bin/m4/main.c
  user/adrian/net80211_tx/usr.bin/m4/parser.y
  user/adrian/net80211_tx/usr.bin/m4/tokenizer.l
  user/adrian/net80211_tx/usr.bin/xlint/lint1/scan.l
  user/adrian/net80211_tx/usr.sbin/apmd/apmdlex.l
  user/adrian/net80211_tx/usr.sbin/bhyve/pci_virtio_net.c
  user/adrian/net80211_tx/usr.sbin/bhyve/virtio.h
  user/adrian/net80211_tx/usr.sbin/bsdconfig/Makefile
  user/adrian/net80211_tx/usr.sbin/bsdconfig/dot/dot
  user/adrian/net80211_tx/usr.sbin/bsdconfig/include/messages.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/include/options.hlp
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/Makefile
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/common.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/media/options.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/script.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/variable.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcdelete
  user/adrian/net80211_tx/usr.sbin/config/lang.l
  user/adrian/net80211_tx/usr.sbin/gssd/gssd.c
  user/adrian/net80211_tx/usr.sbin/jail/jaillex.l
  user/adrian/net80211_tx/usr.sbin/kbdcontrol/lex.l
  user/adrian/net80211_tx/usr.sbin/ndiscvt/inf-token.l
  user/adrian/net80211_tx/usr.sbin/pmcannotate/pmcannotate.c
  user/adrian/net80211_tx/usr.sbin/rrenumd/lexer.l
  user/adrian/net80211_tx/usr.sbin/rtadvd/rrenum.c
Directory Properties:
  user/adrian/net80211_tx/   (props changed)
  user/adrian/net80211_tx/cddl/   (props changed)
  user/adrian/net80211_tx/contrib/binutils/   (props changed)
  user/adrian/net80211_tx/lib/libc/   (props changed)
  user/adrian/net80211_tx/lib/libz/   (props changed)
  user/adrian/net80211_tx/sbin/   (props changed)
  user/adrian/net80211_tx/share/man/man4/   (props changed)
  user/adrian/net80211_tx/sys/   (props changed)
  user/adrian/net80211_tx/sys/amd64/vmm/   (props changed)
  user/adrian/net80211_tx/sys/boot/   (props changed)
  user/adrian/net80211_tx/sys/conf/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/   (props changed)
  user/adrian/net80211_tx/sys/contrib/octeon-sdk/   (props changed)
  user/adrian/net80211_tx/usr.bin/calendar/   (props changed)
  user/adrian/net80211_tx/usr.bin/csup/   (props changed)
  user/adrian/net80211_tx/usr.sbin/bhyve/   (props changed)
  user/adrian/net80211_tx/usr.sbin/jail/   (props changed)
  user/adrian/net80211_tx/usr.sbin/ndiscvt/   (props changed)
  user/adrian/net80211_tx/usr.sbin/rtadvd/   (props changed)

Modified: user/adrian/net80211_tx/bin/sh/input.c
==============================================================================
--- user/adrian/net80211_tx/bin/sh/input.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/bin/sh/input.c	Wed May  8 00:58:18 2013	(r250343)
@@ -397,10 +397,10 @@ setinputfile(const char *fname, int push
 	int fd2;
 
 	INTOFF;
-	if ((fd = open(fname, O_RDONLY)) < 0)
+	if ((fd = open(fname, O_RDONLY | O_CLOEXEC)) < 0)
 		error("cannot open %s: %s", fname, strerror(errno));
 	if (fd < 10) {
-		fd2 = fcntl(fd, F_DUPFD, 10);
+		fd2 = fcntl(fd, F_DUPFD_CLOEXEC, 10);
 		close(fd);
 		if (fd2 < 0)
 			error("Out of file descriptors");
@@ -412,14 +412,13 @@ setinputfile(const char *fname, int push
 
 
 /*
- * Like setinputfile, but takes an open file descriptor.  Call this with
- * interrupts off.
+ * Like setinputfile, but takes an open file descriptor (which should have
+ * its FD_CLOEXEC flag already set).  Call this with interrupts off.
  */
 
 void
 setinputfd(int fd, int push)
 {
-	(void)fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (push) {
 		pushfile();
 		parsefile->buf = ckmalloc(BUFSIZ + 1);

Modified: user/adrian/net80211_tx/bin/sh/jobs.c
==============================================================================
--- user/adrian/net80211_tx/bin/sh/jobs.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/bin/sh/jobs.c	Wed May  8 00:58:18 2013	(r250343)
@@ -127,11 +127,12 @@ setjobctl(int on)
 	if (on) {
 		if (ttyfd != -1)
 			close(ttyfd);
-		if ((ttyfd = open(_PATH_TTY, O_RDWR)) < 0) {
+		if ((ttyfd = open(_PATH_TTY, O_RDWR | O_CLOEXEC)) < 0) {
 			i = 0;
 			while (i <= 2 && !isatty(i))
 				i++;
-			if (i > 2 || (ttyfd = fcntl(i, F_DUPFD, 10)) < 0)
+			if (i > 2 ||
+			    (ttyfd = fcntl(i, F_DUPFD_CLOEXEC, 10)) < 0)
 				goto out;
 		}
 		if (ttyfd < 10) {
@@ -139,7 +140,7 @@ setjobctl(int on)
 			 * Keep our TTY file descriptor out of the way of
 			 * the user's redirections.
 			 */
-			if ((i = fcntl(ttyfd, F_DUPFD, 10)) < 0) {
+			if ((i = fcntl(ttyfd, F_DUPFD_CLOEXEC, 10)) < 0) {
 				close(ttyfd);
 				ttyfd = -1;
 				goto out;
@@ -147,11 +148,6 @@ setjobctl(int on)
 			close(ttyfd);
 			ttyfd = i;
 		}
-		if (fcntl(ttyfd, F_SETFD, FD_CLOEXEC) < 0) {
-			close(ttyfd);
-			ttyfd = -1;
-			goto out;
-		}
 		do { /* while we are in the background */
 			initialpgrp = tcgetpgrp(ttyfd);
 			if (initialpgrp < 0) {

Modified: user/adrian/net80211_tx/bin/sh/main.c
==============================================================================
--- user/adrian/net80211_tx/bin/sh/main.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/bin/sh/main.c	Wed May  8 00:58:18 2013	(r250343)
@@ -248,7 +248,7 @@ read_profile(const char *name)
 	if (expandedname == NULL)
 		return;
 	INTOFF;
-	if ((fd = open(expandedname, O_RDONLY)) >= 0)
+	if ((fd = open(expandedname, O_RDONLY | O_CLOEXEC)) >= 0)
 		setinputfd(fd, 1);
 	INTON;
 	if (fd < 0)

Modified: user/adrian/net80211_tx/bin/sh/miscbltin.c
==============================================================================
--- user/adrian/net80211_tx/bin/sh/miscbltin.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/bin/sh/miscbltin.c	Wed May  8 00:58:18 2013	(r250343)
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include "error.h"
 #include "mystring.h"
 #include "syntax.h"
+#include "trap.h"
 
 #undef eflag
 
@@ -102,6 +103,8 @@ readcmd(int argc __unused, char **argv _
 	struct timeval tv;
 	char *tvptr;
 	fd_set ifds;
+	ssize_t nread;
+	int sig;
 
 	rflag = 0;
 	prompt = NULL;
@@ -156,8 +159,10 @@ readcmd(int argc __unused, char **argv _
 		/*
 		 * If there's nothing ready, return an error.
 		 */
-		if (status <= 0)
-			return(1);
+		if (status <= 0) {
+			sig = pendingsig;
+			return (128 + (sig != 0 ? sig : SIGALRM));
+		}
 	}
 
 	status = 0;
@@ -165,7 +170,19 @@ readcmd(int argc __unused, char **argv _
 	backslash = 0;
 	STARTSTACKSTR(p);
 	for (;;) {
-		if (read(STDIN_FILENO, &c, 1) != 1) {
+		nread = read(STDIN_FILENO, &c, 1);
+		if (nread == -1) {
+			if (errno == EINTR) {
+				sig = pendingsig;
+				if (sig == 0)
+					continue;
+				status = 128 + sig;
+				break;
+			}
+			warning("read error: %s", strerror(errno));
+			status = 2;
+			break;
+		} else if (nread != 1) {
 			status = 1;
 			break;
 		}

Modified: user/adrian/net80211_tx/bin/sh/redir.c
==============================================================================
--- user/adrian/net80211_tx/bin/sh/redir.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/bin/sh/redir.c	Wed May  8 00:58:18 2013	(r250343)
@@ -121,7 +121,7 @@ redirect(union node *redir, int flags)
 
 		if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) {
 			INTOFF;
-			if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
+			if ((i = fcntl(fd, F_DUPFD_CLOEXEC, 10)) == -1) {
 				switch (errno) {
 				case EBADF:
 					i = CLOSED;
@@ -131,8 +131,7 @@ redirect(union node *redir, int flags)
 					error("%d: %s", fd, strerror(errno));
 					break;
 				}
-			} else
-				(void)fcntl(i, F_SETFD, FD_CLOEXEC);
+			}
 			sv->renamed[fd] = i;
 			INTON;
 		}

Modified: user/adrian/net80211_tx/bin/sh/sh.1
==============================================================================
--- user/adrian/net80211_tx/bin/sh/sh.1	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/bin/sh/sh.1	Wed May  8 00:58:18 2013	(r250343)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd April 21, 2013
+.Dd May 3, 2013
 .Dt SH 1
 .Os
 .Sh NAME
@@ -2372,7 +2372,9 @@ option is specified and the
 elapses before a complete line of input is supplied,
 the
 .Ic read
-command will return an exit status of 1 without assigning any values.
+command will return an exit status as if terminated by
+.Dv SIGALRM
+without assigning any values.
 The
 .Ar timeout
 value may optionally be followed by one of
@@ -2388,6 +2390,11 @@ is assumed.
 The
 .Fl e
 option exists only for backward compatibility with older scripts.
+.Pp
+The exit status is 0 on success, 1 on end of file,
+between 2 and 128 if an error occurs
+and greater than 128 if a trapped signal interrupts
+.Ic read .
 .It Ic readonly Oo Fl p Oc Op Ar name ...
 Each specified
 .Ar name

Modified: user/adrian/net80211_tx/cddl/lib/drti/Makefile
==============================================================================
--- user/adrian/net80211_tx/cddl/lib/drti/Makefile	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/cddl/lib/drti/Makefile	Wed May  8 00:58:18 2013	(r250343)
@@ -9,6 +9,8 @@ FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
 FILESDIR=	${LIBDIR}/dtrace
 CLEANFILES=	${FILES}
+LIB=		drti-dummy
+INTERNALLIB=
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
@@ -18,4 +20,10 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-DPIC ${PICFLAG}
 
+.if make(install) && defined(LIBRARIES_ONLY)
+install:
+	${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \
+	    ${FILES} ${DESTDIR}${FILESDIR}
+.endif
+
 .include <bsd.lib.mk>

Modified: user/adrian/net80211_tx/contrib/binutils/binutils/arlex.l
==============================================================================
--- user/adrian/net80211_tx/contrib/binutils/binutils/arlex.l	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/contrib/binutils/binutils/arlex.l	Wed May  8 00:58:18 2013	(r250343)
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street - F
 #include "libiberty.h"
 #include "arparse.h"
 
-#define YY_NO_UNPUT
-
 extern int yylex (void);
 
 int linenumber;
 %}
 
+%option nounput
+
 %a 10000
 %o 25000
 

Modified: user/adrian/net80211_tx/contrib/binutils/ld/ldlex.l
==============================================================================
--- user/adrian/net80211_tx/contrib/binutils/ld/ldlex.l	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/contrib/binutils/ld/ldlex.l	Wed May  8 00:58:18 2013	(r250343)
@@ -63,8 +63,6 @@ const char *lex_string = NULL;
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max_size) yy_input (buf, &result, max_size)
 
-#define YY_NO_UNPUT
-
 #define MAX_INCLUDE_DEPTH 10
 static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
 static const char *file_name_stack[MAX_INCLUDE_DEPTH];
@@ -72,7 +70,7 @@ static unsigned int lineno_stack[MAX_INC
 static unsigned int include_stack_ptr = 0;
 static int vers_node_nesting = 0;
 
-static void yy_input (char *, int *, int);
+static void yy_input (char *, yy_size_t *, yy_size_t);
 static void comment (void);
 static void lex_warn_invalid (char *where, char *what);
 
@@ -94,6 +92,8 @@ int yywrap (void) { return 1; }
 #endif
 %}
 
+%option nounput
+
 %a 4000
 %o 5000
 
@@ -612,7 +612,7 @@ ldlex_popstate (void)
    either the number of characters read, or 0 to indicate EOF.  */
 
 static void
-yy_input (char *buf, int *result, int max_size)
+yy_input (char *buf, yy_size_t *result, yy_size_t max_size)
 {
   *result = 0;
   if (YY_CURRENT_BUFFER->yy_input_file)

Modified: user/adrian/net80211_tx/contrib/smbfs/lib/smb/ctx.c
==============================================================================
--- user/adrian/net80211_tx/contrib/smbfs/lib/smb/ctx.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/contrib/smbfs/lib/smb/ctx.c	Wed May  8 00:58:18 2013	(r250343)
@@ -602,40 +602,12 @@ smb_ctx_gethandle(struct smb_ctx *ctx)
 	int fd, i;
 	char buf[20];
 
-	/*
-	 * First, try to open as cloned device
-	 */
 	fd = open("/dev/"NSMB_NAME, O_RDWR);
 	if (fd >= 0) {
 		ctx->ct_fd = fd;
 		return 0;
 	}
-	/*
-	 * well, no clone capabilities available - we have to scan
-	 * all devices in order to get free one
-	 */
-	 for (i = 0; i < 1024; i++) {
-	         snprintf(buf, sizeof(buf), "/dev/%s%d", NSMB_NAME, i);
-		 fd = open(buf, O_RDWR);
-		 if (fd >= 0) {
-			ctx->ct_fd = fd;
-			return 0;
-		 }
-	 }
-	 /*
-	  * This is a compatibility with old /dev/net/nsmb device
-	  */
-	 for (i = 0; i < 1024; i++) {
-	         snprintf(buf, sizeof(buf), "/dev/net/%s%d", NSMB_NAME, i);
-		 fd = open(buf, O_RDWR);
-		 if (fd >= 0) {
-			ctx->ct_fd = fd;
-			return 0;
-		 }
-		 if (errno == ENOENT)
-		         return ENOENT;
-	 }
-	 return ENOENT;
+	return ENOENT;
 }
 
 int

Modified: user/adrian/net80211_tx/contrib/smbfs/mount_smbfs/mount_smbfs.c
==============================================================================
--- user/adrian/net80211_tx/contrib/smbfs/mount_smbfs/mount_smbfs.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/contrib/smbfs/mount_smbfs/mount_smbfs.c	Wed May  8 00:58:18 2013	(r250343)
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
 	struct xvfsconf vfc;
 #endif
 	char *next;
-	int opt, error, mntflags, caseopt, dev;
+	int opt, error, mntflags, caseopt, fd;
 	uid_t uid;
 	gid_t gid;
 	mode_t dir_mode, file_mode;
@@ -90,7 +90,7 @@ main(int argc, char *argv[])
 
 	iov = NULL;
 	iovlen = 0;
-	dev = 0;
+	fd = 0;
 	uid = (uid_t)-1;
 	gid = (gid_t)-1;
 	caseopt = 0;
@@ -266,11 +266,11 @@ main(int argc, char *argv[])
 		exit(1);
 	}
 
-	dev = ctx->ct_fd;
+	fd = ctx->ct_fd;
 
 	build_iovec(&iov, &iovlen, "fstype", strdup("smbfs"), -1);
 	build_iovec(&iov, &iovlen, "fspath", mount_point, -1);
-	build_iovec_argf(&iov, &iovlen, "dev", "%d", dev);
+	build_iovec_argf(&iov, &iovlen, "fd", "%d", fd);
 	build_iovec(&iov, &iovlen, "mountpoint", mount_point, -1);
 	build_iovec_argf(&iov, &iovlen, "uid", "%d", uid);
 	build_iovec_argf(&iov, &iovlen, "gid", "%d", gid);

Modified: user/adrian/net80211_tx/etc/rc.d/ip6addrctl
==============================================================================
--- user/adrian/net80211_tx/etc/rc.d/ip6addrctl	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/etc/rc.d/ip6addrctl	Wed May  8 00:58:18 2013	(r250343)
@@ -24,38 +24,42 @@ config_file="/etc/ip6addrctl.conf"
 set_rcvar_obsolete ipv6_enable ipv6_activate_all_interfaces
 set_rcvar_obsolete ipv6_prefer ip6addrctl_policy
 
+IP6ADDRCTL_CMD="/usr/sbin/ip6addrctl"
+
 ip6addrctl_prefer_ipv6()
 {
 	afexists inet6 || return 0
 
-	ip6addrctl flush >/dev/null 2>&1
-	ip6addrctl add ::1/128		 50	 0
-	ip6addrctl add ::/0		 40	 1
-	ip6addrctl add ::ffff:0:0/96	 35	 4
-	ip6addrctl add 2002::/16	 30	 2
-	ip6addrctl add 2001::/32	  5	 5
-	ip6addrctl add fc00::/7		  3	13
-	ip6addrctl add ::/96		  1	 3
-	ip6addrctl add fec0::/10	  1	11
-	ip6addrctl add 3ffe::/16	  1	12
-	checkyesno ip6addrctl_verbose && ip6addrctl
+	${IP6ADDRCTL_CMD} flush >/dev/null 2>&1
+	cat <<EOT | ${IP6ADDRCTL_CMD} install /dev/stdin
+	::1/128		 50	 0
+	::/0		 40	 1
+	::ffff:0:0/96	 35	 4
+	2002::/16	 30	 2
+	2001::/32	  5	 5
+	fc00::/7	  3	13
+	::/96		  1	 3
+	fec0::/10	  1	11
+	3ffe::/16	  1	12
+EOT
 }
 
 ip6addrctl_prefer_ipv4()
 {
 	afexists inet6 || return 0
 
-	ip6addrctl flush >/dev/null 2>&1
-	ip6addrctl add ::1/128		 50	 0
-	ip6addrctl add ::/0		 40	 1
-	ip6addrctl add ::ffff:0:0/96	100	 4
-	ip6addrctl add 2002::/16	 30	 2
-	ip6addrctl add 2001::/32	  5	 5
-	ip6addrctl add fc00::/7		  3	13
-	ip6addrctl add ::/96		  1	 3
-	ip6addrctl add fec0::/10	  1	11
-	ip6addrctl add 3ffe::/16	  1	12
-	checkyesno ip6addrctl_verbose && ip6addrctl
+	${IP6ADDRCTL_CMD} flush >/dev/null 2>&1
+	cat <<EOT | ${IP6ADDRCTL_CMD} install /dev/stdin
+	::1/128		 50	 0
+	::/0		 40	 1
+	::ffff:0:0/96	100	 4
+	2002::/16	 30	 2
+	2001::/32	  5	 5
+	fc00::/7	  3	13
+	::/96		  1	 3
+	fec0::/10	  1	11
+	3ffe::/16	  1	12
+EOT
 }
 
 ip6addrctl_start()
@@ -66,9 +70,8 @@ ip6addrctl_start()
 	case "${ip6addrctl_policy}" in
 	[Aa][Uu][Tt][Oo])
 		if [ -r "${config_file}" -a -s "${config_file}" ]; then
-			ip6addrctl flush >/dev/null 2>&1
-			ip6addrctl install "${config_file}"
-			checkyesno ip6addrctl_verbose && ip6addrctl
+			${IP6ADDRCTL_CMD} flush >/dev/null 2>&1
+			${IP6ADDRCTL_CMD} install "${config_file}"
 		else
 			if checkyesno ipv6_activate_all_interfaces; then
 				ip6addrctl_prefer_ipv6
@@ -92,7 +95,7 @@ ip6addrctl_start()
 		ip6addrctl_prefer_ipv4
 	;;
 	[Nn][Oo][Nn][Ee])
-		ip6addrctl flush >/dev/null 2>&1
+		${IP6ADDRCTL_CMD} flush >/dev/null 2>&1
 	;;
 	*)
 		warn "\$ip6addrctl_policy is invalid: ${ip6addrctl_policy}. " \
@@ -100,6 +103,11 @@ ip6addrctl_start()
 		ip6addrctl_prefer_ipv4
 	;;
 	esac
+
+	if checkyesno ip6addrctl_verbose; then
+		echo 'Address selection policy table for IPv4 and IPv6:'
+		${IP6ADDRCTL_CMD}
+	fi
 }
 
 ip6addrctl_stop()

Modified: user/adrian/net80211_tx/etc/rc.d/mountlate
==============================================================================
--- user/adrian/net80211_tx/etc/rc.d/mountlate	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/etc/rc.d/mountlate	Wed May  8 00:58:18 2013	(r250343)
@@ -21,19 +21,10 @@ mountlate_start()
 	# Mount "late" filesystems.
 	#
 	err=0
-	latefs=
-	# / (root) fs is always remounted, so remove from list
-	latefs="`/sbin/mount -d -a -l | grep -v ' /$'`"
-	case ${latefs} in
-	'')
-		;;
-	*)
-		echo -n 'Mounting late file systems:'
-		mount -a -l
-		err=$?
-		echo '.'
-		;;
-	esac
+	echo -n 'Mounting late file systems:'
+	mount -a -L
+	err=$?
+	echo '.'
 
 	case ${err} in
 	0)

Modified: user/adrian/net80211_tx/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
==============================================================================
--- user/adrian/net80211_tx/kerberos5/lib/libgssapi_krb5/pname_to_uid.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/kerberos5/lib/libgssapi_krb5/pname_to_uid.c	Wed May  8 00:58:18 2013	(r250343)
@@ -26,6 +26,7 @@
  */
 /* $FreeBSD$ */
 
+#include <errno.h>
 #include <pwd.h>
 
 #include "krb5/gsskrb5_locl.h"
@@ -37,8 +38,12 @@ _gsskrb5_pname_to_uid(OM_uint32 *minor_s
 	krb5_context context;
 	krb5_const_principal name = (krb5_const_principal) pname;
 	krb5_error_code kret;
-	char lname[MAXLOGNAME + 1], buf[128];
+	char lname[MAXLOGNAME + 1], buf[1024], *bufp;
 	struct passwd pwd, *pw;
+	size_t buflen;
+	int error;
+	OM_uint32 ret;
+	static size_t buflen_hint = 1024;
 
 	GSSAPI_KRB5_INIT (&context);
 
@@ -49,11 +54,30 @@ _gsskrb5_pname_to_uid(OM_uint32 *minor_s
 	}
 
 	*minor_status = 0;
-	getpwnam_r(lname, &pwd, buf, sizeof(buf), &pw);
+	buflen = buflen_hint;
+	for (;;) {
+		pw = NULL;
+		bufp = buf;
+		if (buflen > sizeof(buf))
+			bufp = malloc(buflen);
+		if (bufp == NULL)
+			break;
+		error = getpwnam_r(lname, &pwd, bufp, buflen, &pw);
+		if (error != ERANGE)
+			break;
+		if (buflen > sizeof(buf))
+			free(bufp);
+		buflen += 1024;
+		if (buflen > buflen_hint)
+			buflen_hint = buflen;
+	}
 	if (pw) {
 		*uidp = pw->pw_uid;
-		return (GSS_S_COMPLETE);
+		ret = GSS_S_COMPLETE;
 	} else {
-		return (GSS_S_FAILURE);
+		ret = GSS_S_FAILURE;
 	}
+	if (bufp != NULL && buflen > sizeof(buf))
+		free(bufp);
+	return (ret);
 }

Modified: user/adrian/net80211_tx/lib/clang/include/llvm/Config/config.h
==============================================================================
--- user/adrian/net80211_tx/lib/clang/include/llvm/Config/config.h	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/clang/include/llvm/Config/config.h	Wed May  8 00:58:18 2013	(r250343)
@@ -5,6 +5,9 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+/* Get __FreeBSD_version. */
+#include <osreldate.h>
+
 /* Bug report URL. */
 #define BUG_REPORT_URL "http://llvm.org/bugs/"
 
@@ -248,7 +251,9 @@
 #define HAVE_LOG10 1
 
 /* Define to 1 if you have the `log2' function. */
+#if __FreeBSD_version >= 900027 || (__FreeBSD_version < 900000 && __FreeBSD_version >= 802502)
 #define HAVE_LOG2 1
+#endif
 
 /* Define to 1 if you have the `longjmp' function. */
 #define HAVE_LONGJMP 1

Modified: user/adrian/net80211_tx/lib/libc/gen/errlst.c
==============================================================================
--- user/adrian/net80211_tx/lib/libc/gen/errlst.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/gen/errlst.c	Wed May  8 00:58:18 2013	(r250343)
@@ -152,5 +152,7 @@ const char *const sys_errlist[] = {
 	"Protocol error",			/* 92 - EPROTO */
 	"Capabilities insufficient",		/* 93 - ENOTCAPABLE */
 	"Not permitted in capability mode",	/* 94 - ECAPMODE */
+	"State not recoverable",		/* 95 - ENOTRECOVERABLE */
+	"Previous owner died",			/* 96 - EOWNERDEAD */
 };
 const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);

Modified: user/adrian/net80211_tx/lib/libc/locale/duplocale.3
==============================================================================
--- user/adrian/net80211_tx/lib/libc/locale/duplocale.3	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/locale/duplocale.3	Wed May  8 00:58:18 2013	(r250343)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 17 2011
+.Dd September 17, 2011
 .Dt DUPLOCALE 3
 .Os
 .Sh NAME
@@ -66,8 +66,8 @@ The locale returned by this call must be
 .Xr uselocale 3 ,
 .Xr xlocale 3
 .Sh STANDARDS
-This function, conforms to
-.St -p1003.1-2008
+This function conforms to
+.St -p1003.1-2008 .
 .Sh BUGS
 Ideally,
 .Xr uselocale 3

Modified: user/adrian/net80211_tx/lib/libc/locale/freelocale.3
==============================================================================
--- user/adrian/net80211_tx/lib/libc/locale/freelocale.3	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/locale/freelocale.3	Wed May  8 00:58:18 2013	(r250343)
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd September 17 2011
+.Dd September 17, 2011
 .Dt FREELOCALE 3
 .Os
 .Sh NAME
@@ -57,5 +57,12 @@ Returns 0 on success or -1 on error.
 .Xr uselocale 3 ,
 .Xr xlocale 3
 .Sh STANDARDS
-This function, conforms to
-.St -p1003.1-2008 .
+The
+.Fn freelocale
+function
+differs from
+.St -p1003.1-2008
+in that its return type is
+.Vt int
+rather than
+.Vt void .

Modified: user/adrian/net80211_tx/lib/libc/locale/newlocale.3
==============================================================================
--- user/adrian/net80211_tx/lib/libc/locale/newlocale.3	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/locale/newlocale.3	Wed May  8 00:58:18 2013	(r250343)
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd September 17 2011
+.Dd September 17, 2011
 .Dt NEWLOCALE 3
 .Os
 .Sh NAME
@@ -108,5 +108,5 @@ You must free the returned locale with
 .Xr uselocale 3 ,
 .Xr xlocale 3
 .Sh STANDARDS
-This function, conforms to
-.St -p1003.1-2008
+This function conforms to
+.St -p1003.1-2008 .

Modified: user/adrian/net80211_tx/lib/libc/locale/querylocale.3
==============================================================================
--- user/adrian/net80211_tx/lib/libc/locale/querylocale.3	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/locale/querylocale.3	Wed May  8 00:58:18 2013	(r250343)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 17 2011
+.Dd May 3, 2013
 .Dt QUERYLOCALE 3
 .Os
 .Sh NAME
@@ -52,6 +52,3 @@ If more than one bit in the mask is set,
 .Xr newlocale 3 ,
 .Xr uselocale 3 ,
 .Xr xlocale 3
-.Sh STANDARDS
-This function, conforms to
-.St -p1003.1-2008

Modified: user/adrian/net80211_tx/lib/libc/locale/uselocale.3
==============================================================================
--- user/adrian/net80211_tx/lib/libc/locale/uselocale.3	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/locale/uselocale.3	Wed May  8 00:58:18 2013	(r250343)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 17 2011
+.Dd September 17, 2011
 .Dt USELOCALE 3
 .Os
 .Sh NAME
@@ -57,4 +57,4 @@ or LC_GLOBAL_LOCALE if this thread has n
 .Xr xlocale 3
 .Sh STANDARDS
 This function conforms to
-.St -p1003.1-2008
+.St -p1003.1-2008 .

Modified: user/adrian/net80211_tx/lib/libc/locale/xlocale.3
==============================================================================
--- user/adrian/net80211_tx/lib/libc/locale/xlocale.3	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/locale/xlocale.3	Wed May  8 00:58:18 2013	(r250343)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 17 2011
+.Dd September 17, 2011
 .Dt XLOCALE 3
 .Os
 .Sh NAME

Modified: user/adrian/net80211_tx/lib/libc/net/nslexer.l
==============================================================================
--- user/adrian/net80211_tx/lib/libc/net/nslexer.l	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/net/nslexer.l	Wed May  8 00:58:18 2013	(r250343)
@@ -53,11 +53,10 @@ static char *rcsid = 
 
 #include "nsparser.h"
 
-#define	YY_NO_INPUT
-#define YY_NO_UNPUT
-
 %}
 
+%option noinput
+%option nounput
 %option yylineno
 
 BLANK		[ \t]

Modified: user/adrian/net80211_tx/lib/libc/nls/C.msg
==============================================================================
--- user/adrian/net80211_tx/lib/libc/nls/C.msg	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/nls/C.msg	Wed May  8 00:58:18 2013	(r250343)
@@ -191,6 +191,12 @@ $ EPROTO
 92 Protocol error
 $ ENOTCAPABLE
 93 Capabilities insufficient
+$ ECAPMODE
+94 Not permitted in capability mode
+$ ENOTRECOVERABLE
+95 State not recoverable
+$ EOWNERDEAD
+96 Previous owner died
 $
 $ strsignal() support catalog
 $

Modified: user/adrian/net80211_tx/lib/libc/sys/intro.2
==============================================================================
--- user/adrian/net80211_tx/lib/libc/sys/intro.2	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libc/sys/intro.2	Wed May  8 00:58:18 2013	(r250343)
@@ -28,7 +28,7 @@
 .\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
 .\" $FreeBSD$
 .\"
-.Dd April 27, 2013
+.Dd May 4, 2013
 .Dt INTRO 2
 .Os
 .Sh NAME
@@ -470,6 +470,10 @@ An operation on a capability file descri
 the capability allows.
 .It Er 94 ECAPMODE Em "Not permitted in capability mode" .
 The system call or operation is not permitted for capability mode processes.
+.It Er 95 ENOTRECOVERABLE Em "State not recoverable" .
+The state protected by a robust mutex is not recoverable.
+.It Er 96 EOWNERDEAD Em "Previous owner died" .
+The owner of a robust mutex terminated while holding the mutex lock.
 .El
 .Sh DEFINITIONS
 .Bl -tag -width Ds

Modified: user/adrian/net80211_tx/lib/libipsec/policy_token.l
==============================================================================
--- user/adrian/net80211_tx/lib/libipsec/policy_token.l	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libipsec/policy_token.l	Wed May  8 00:58:18 2013	(r250343)
@@ -139,8 +139,8 @@ void
 __policy__strbuffer__init__(msg)
 	char *msg;
 {
-	if (yy_current_buffer)
-		yy_delete_buffer(yy_current_buffer);
+	if (YY_CURRENT_BUFFER)
+		yy_delete_buffer(YY_CURRENT_BUFFER);
 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
 	yy_switch_to_buffer(strbuffer);
 

Modified: user/adrian/net80211_tx/lib/libkvm/kvm.c
==============================================================================
--- user/adrian/net80211_tx/lib/libkvm/kvm.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libkvm/kvm.c	Wed May  8 00:58:18 2013	(r250343)
@@ -166,7 +166,7 @@ _kvm_open(kvm_t *kd, const char *uf, con
 	if (mf == 0)
 		mf = _PATH_MEM;
 
-	if ((kd->pmfd = open(mf, flag, 0)) < 0) {
+	if ((kd->pmfd = open(mf, flag | O_CLOEXEC, 0)) < 0) {
 		_kvm_syserr(kd, kd->program, "%s", mf);
 		goto failed;
 	}
@@ -179,10 +179,6 @@ _kvm_open(kvm_t *kd, const char *uf, con
 		_kvm_syserr(kd, kd->program, "empty file");
 		goto failed;
 	}
-	if (fcntl(kd->pmfd, F_SETFD, FD_CLOEXEC) < 0) {
-		_kvm_syserr(kd, kd->program, "%s", mf);
-		goto failed;
-	}
 	if (S_ISCHR(st.st_mode)) {
 		/*
 		 * If this is a character special device, then check that
@@ -191,14 +187,11 @@ _kvm_open(kvm_t *kd, const char *uf, con
 		 * case you're working with a live kernel.)
 		 */
 		if (strcmp(mf, _PATH_DEVNULL) == 0) {
-			kd->vmfd = open(_PATH_DEVNULL, O_RDONLY);
+			kd->vmfd = open(_PATH_DEVNULL, O_RDONLY | O_CLOEXEC);
 			return (kd);
 		} else if (strcmp(mf, _PATH_MEM) == 0) {
-			if ((kd->vmfd = open(_PATH_KMEM, flag)) < 0) {
-				_kvm_syserr(kd, kd->program, "%s", _PATH_KMEM);
-				goto failed;
-			}
-			if (fcntl(kd->vmfd, F_SETFD, FD_CLOEXEC) < 0) {
+			if ((kd->vmfd = open(_PATH_KMEM, flag | O_CLOEXEC)) <
+			    0) {
 				_kvm_syserr(kd, kd->program, "%s", _PATH_KMEM);
 				goto failed;
 			}
@@ -210,11 +203,7 @@ _kvm_open(kvm_t *kd, const char *uf, con
 	 * Initialize the virtual address translation machinery,
 	 * but first setup the namelist fd.
 	 */
-	if ((kd->nlfd = open(uf, O_RDONLY, 0)) < 0) {
-		_kvm_syserr(kd, kd->program, "%s", uf);
-		goto failed;
-	}
-	if (fcntl(kd->nlfd, F_SETFD, FD_CLOEXEC) < 0) {
+	if ((kd->nlfd = open(uf, O_RDONLY | O_CLOEXEC, 0)) < 0) {
 		_kvm_syserr(kd, kd->program, "%s", uf);
 		goto failed;
 	}

Modified: user/adrian/net80211_tx/lib/libpmc/Makefile
==============================================================================
--- user/adrian/net80211_tx/lib/libpmc/Makefile	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libpmc/Makefile	Wed May  8 00:58:18 2013	(r250343)
@@ -23,35 +23,31 @@ MAN+=	pmclog.3
 MAN+=	pmc.soft.3
 
 # PMC-dependent manual pages
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 MAN+=	pmc.atom.3
 MAN+=	pmc.core.3
 MAN+=	pmc.core2.3
+MAN+=	pmc.corei7.3
+MAN+=	pmc.corei7uc.3
 MAN+=	pmc.haswell.3
 MAN+=	pmc.haswelluc.3
 MAN+=	pmc.iaf.3
 MAN+=	pmc.ivybridge.3
 MAN+=	pmc.ivybridgexeon.3
-MAN+=	pmc.ucf.3
 MAN+=	pmc.k7.3
 MAN+=	pmc.k8.3
+MAN+=	pmc.mips24k.3
+MAN+=	pmc.octeon.3
 MAN+=	pmc.p4.3
 MAN+=	pmc.p5.3
 MAN+=	pmc.p6.3
-MAN+=	pmc.corei7.3
-MAN+=	pmc.corei7uc.3
 MAN+=	pmc.sandybridge.3
-MAN+=	pmc.sandybridgeuc.3	
-MAN+=	pmc.sandybridgexeon.3	
+MAN+=	pmc.sandybridgeuc.3
+MAN+=	pmc.sandybridgexeon.3
+MAN+=	pmc.tsc.3
+MAN+=	pmc.ucf.3
 MAN+=	pmc.westmere.3
 MAN+=	pmc.westmereuc.3
-MAN+=	pmc.tsc.3
-.elif ${MACHINE_CPUARCH} == "arm"
 MAN+=	pmc.xscale.3
-.elif ${MACHINE_CPUARCH} == "mips"
-MAN+=	pmc.mips24k.3
-MAN+=	pmc.octeon.3
-.endif
 
 MLINKS+= \
 	pmc_allocate.3 pmc_release.3 \

Modified: user/adrian/net80211_tx/lib/libprocstat/Symbol.map
==============================================================================
--- user/adrian/net80211_tx/lib/libprocstat/Symbol.map	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libprocstat/Symbol.map	Wed May  8 00:58:18 2013	(r250343)
@@ -22,6 +22,7 @@ FBSD_1.3 {
 	procstat_freegroups;
 	procstat_freekstack;
 	procstat_freevmmap;
+	procstat_get_sem_info;
 	procstat_get_shm_info;
 	procstat_getargv;
 	procstat_getauxv;

Modified: user/adrian/net80211_tx/lib/libprocstat/libprocstat.3
==============================================================================
--- user/adrian/net80211_tx/lib/libprocstat/libprocstat.3	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libprocstat/libprocstat.3	Wed May  8 00:58:18 2013	(r250343)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 20, 2013
+.Dd May 3, 2013
 .Dt LIBPROCSTAT 3
 .Os
 .Sh NAME
@@ -53,6 +53,7 @@
 .Nm procstat_freevmmap ,
 .Nm procstat_get_pipe_info ,
 .Nm procstat_get_pts_info ,
+.Nm procstat_get_sem_info ,
 .Nm procstat_get_shm_info ,
 .Nm procstat_get_socket_info ,
 .Nm procstat_get_vnode_info
@@ -115,6 +116,13 @@
 .Fa "char *errbuf"
 .Fc
 .Ft int
+.Fo procstat_get_sem_info
+.Fa "struct procstat *procstat"
+.Fa "struct filestat *fst"
+.Fa "struct semstat *sem"
+.Fa "char *errbuf"
+.Fc
+.Ft int
 .Fo procstat_get_shm_info
 .Fa "struct procstat *procstat"
 .Fa "struct filestat *fst"
@@ -463,12 +471,13 @@ function call.
 The
 .Fn procstat_get_pipe_info ,
 .Fn procstat_get_pts_info ,
+.Fn procstat_get_sem_info ,
 .Fn procstat_get_shm_info ,
 .Fn procstat_get_socket_info
 and
 .Fn procstat_get_vnode_info
 functions are used to retrieve information about pipes, pseudo-terminals,
-shared memory objects,
+semaphores, shared memory objects,
 sockets, and vnodes, respectively.
 Each of them have a similar interface API.
 The
@@ -505,6 +514,8 @@ argument indicates an actual error messa
 .Nm procstat_get_pipe_info
 .It Li PS_FST_TYPE_PTS
 .Nm procstat_get_pts_info
+.It Li PS_FST_TYPE_SEM
+.Nm procstat_get_sem_info
 .It Li PS_FST_TYPE_SHM
 .Nm procstat_get_shm_info
 .El
@@ -517,6 +528,7 @@ argument indicates an actual error messa
 .Xr elf 3 ,
 .Xr kvm 3 ,
 .Xr queue 3 ,
+.Xr sem_open 3 ,
 .Xr sysctl 3 ,
 .Xr pts 4 ,
 .Xr core 5 ,

Modified: user/adrian/net80211_tx/lib/libprocstat/libprocstat.c
==============================================================================
--- user/adrian/net80211_tx/lib/libprocstat/libprocstat.c	Wed May  8 00:55:29 2013	(r250342)
+++ user/adrian/net80211_tx/lib/libprocstat/libprocstat.c	Wed May  8 00:58:18 2013	(r250343)
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #define	_WANT_FILE
 #include <sys/file.h>
 #include <sys/conf.h>
+#include <sys/ksem.h>
 #include <sys/mman.h>
 #define	_KERNEL
 #include <sys/mount.h>
@@ -129,6 +130,10 @@ static int	procstat_get_pts_info_sysctl(
     struct ptsstat *pts, char *errbuf);
 static int	procstat_get_pts_info_kvm(kvm_t *kd, struct filestat *fst,
     struct ptsstat *pts, char *errbuf);
+static int	procstat_get_sem_info_sysctl(struct filestat *fst,
+    struct semstat *sem, char *errbuf);
+static int	procstat_get_sem_info_kvm(kvm_t *kd, struct filestat *fst,
+    struct semstat *sem, char *errbuf);
 static int	procstat_get_shm_info_sysctl(struct filestat *fst,
     struct shmstat *shm, char *errbuf);
 static int	procstat_get_shm_info_kvm(kvm_t *kd, struct filestat *fst,
@@ -556,6 +561,10 @@ procstat_getfiles_kvm(struct procstat *p
 			data = file.f_data;
 			break;
 #endif
+		case DTYPE_SEM:
+			type = PS_FST_TYPE_SEM;
+			data = file.f_data;
+			break;
 		case DTYPE_SHM:
 			type = PS_FST_TYPE_SHM;
 			data = file.f_data;
@@ -1003,6 +1012,87 @@ procstat_get_pts_info_sysctl(struct file
 }
 
 int
+procstat_get_sem_info(struct procstat *procstat, struct filestat *fst,
+    struct semstat *sem, char *errbuf)
+{
+
+	assert(sem);
+	if (procstat->type == PROCSTAT_KVM) {
+		return (procstat_get_sem_info_kvm(procstat->kd, fst, sem,
+		    errbuf));
+	} else if (procstat->type == PROCSTAT_SYSCTL ||
+	    procstat->type == PROCSTAT_CORE) {
+		return (procstat_get_sem_info_sysctl(fst, sem, errbuf));
+	} else {
+		warnx("unknown access method: %d", procstat->type);
+		snprintf(errbuf, _POSIX2_LINE_MAX, "error");
+		return (1);
+	}
+}
+
+static int
+procstat_get_sem_info_kvm(kvm_t *kd, struct filestat *fst,
+    struct semstat *sem, char *errbuf)
+{
+	struct ksem ksem;
+	void *ksemp;
+	char *path;
+	int i;
+
+	assert(kd);
+	assert(sem);
+	assert(fst);
+	bzero(sem, sizeof(*sem));
+	ksemp = fst->fs_typedep;
+	if (ksemp == NULL)
+		goto fail;
+	if (!kvm_read_all(kd, (unsigned long)ksemp, &ksem,
+	    sizeof(struct ksem))) {
+		warnx("can't read ksem at %p", (void *)ksemp);
+		goto fail;
+	}
+	sem->mode = S_IFREG | ksem.ks_mode;
+	sem->value = ksem.ks_value;
+	if (fst->fs_path == NULL && ksem.ks_path != NULL) {
+		path = malloc(MAXPATHLEN);
+		for (i = 0; i < MAXPATHLEN - 1; i++) {
+			if (!kvm_read_all(kd, (unsigned long)ksem.ks_path + i,
+			    path + i, 1))
+				break;
+			if (path[i] == '\0')
+				break;
+		}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list