CVS commit: src/sys/net

2014-06-18 Thread Ryota Ozaki 
Module Name:src
Committed By:   ozaki-r
Date:   Wed Jun 18 09:20:46 UTC 2014

Modified Files:
src/sys/net: if_bridge.c

Log Message:
Tidy up bridge_input

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/net/if_bridge.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.81 src/sys/net/if_bridge.c:1.82
--- src/sys/net/if_bridge.c:1.81	Tue Jun 17 10:39:46 2014
+++ src/sys/net/if_bridge.c	Wed Jun 18 09:20:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bridge.c,v 1.81 2014/06/17 10:39:46 ozaki-r Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.82 2014/06/18 09:20:46 ozaki-r Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.81 2014/06/17 10:39:46 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.82 2014/06/18 09:20:46 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
@@ -1569,6 +1569,36 @@ bridge_forward(void *v)
 	KERNEL_UNLOCK_ONE(NULL);
 }
 
+static bool
+bstp_state_before_learning(struct bridge_iflist *bif)
+{
+	if (bif->bif_flags & IFBIF_STP) {
+		switch (bif->bif_state) {
+		case BSTP_IFSTATE_BLOCKING:
+		case BSTP_IFSTATE_LISTENING:
+		case BSTP_IFSTATE_DISABLED:
+			return true;
+		}
+	}
+	return false;
+}
+
+static bool
+bridge_ourether(struct bridge_iflist *bif, struct ether_header *eh, int src)
+{
+	uint8_t *ether = src ? eh->ether_shost : eh->ether_dhost;
+
+	if (memcmp(CLLADDR(bif->bif_ifp->if_sadl), ether, ETHER_ADDR_LEN) == 0
+#if NCARP > 0
+	|| (bif->bif_ifp->if_carp &&
+	carp_ourether(bif->bif_ifp->if_carp, eh, IFT_ETHER, src) != NULL)
+#endif /* NCARP > 0 */
+	)
+		return true;
+
+	return false;
+}
+
 /*
  * bridge_input:
  *
@@ -1614,10 +1644,7 @@ bridge_input(struct ifnet *ifp, struct m
 return;
 			}
 
-			switch (bif->bif_state) {
-			case BSTP_IFSTATE_BLOCKING:
-			case BSTP_IFSTATE_LISTENING:
-			case BSTP_IFSTATE_DISABLED:
+			if (bstp_state_before_learning(bif)) {
 ether_input(ifp, m);
 return;
 			}
@@ -1643,14 +1670,9 @@ bridge_input(struct ifnet *ifp, struct m
 		return;
 	}
 
-	if (bif->bif_flags & IFBIF_STP) {
-		switch (bif->bif_state) {
-		case BSTP_IFSTATE_BLOCKING:
-		case BSTP_IFSTATE_LISTENING:
-		case BSTP_IFSTATE_DISABLED:
-			ether_input(ifp, m);
-			return;
-		}
+	if (bstp_state_before_learning(bif)) {
+		ether_input(ifp, m);
+		return;
 	}
 
 	/*
@@ -1658,13 +1680,7 @@ bridge_input(struct ifnet *ifp, struct m
 	 */
 	LIST_FOREACH(bif, &sc->sc_iflist, bif_next) {
 		/* It is destined for us. */
-		if (memcmp(CLLADDR(bif->bif_ifp->if_sadl), eh->ether_dhost,
-		ETHER_ADDR_LEN) == 0
-#if NCARP > 0
-		|| (bif->bif_ifp->if_carp && carp_ourether(bif->bif_ifp->if_carp,
-			eh, IFT_ETHER, 0) != NULL)
-#endif /* NCARP > 0 */
-		) {
+		if (bridge_ourether(bif, eh, 0)) {
 			if (bif->bif_flags & IFBIF_LEARNING)
 (void) bridge_rtupdate(sc,
 eh->ether_shost, ifp, 0, IFBAF_DYNAMIC);
@@ -1674,13 +1690,7 @@ bridge_input(struct ifnet *ifp, struct m
 		}
 
 		/* We just received a packet that we sent out. */
-		if (memcmp(CLLADDR(bif->bif_ifp->if_sadl), eh->ether_shost,
-		ETHER_ADDR_LEN) == 0
-#if NCARP > 0
-		|| (bif->bif_ifp->if_carp && carp_ourether(bif->bif_ifp->if_carp,
-			eh, IFT_ETHER, 1) != NULL)
-#endif /* NCARP > 0 */
-		) {
+		if (bridge_ourether(bif, eh, 1)) {
 			m_freem(m);
 			return;
 		}

CVS commit: [netbsd-6-1] src/sys

2014-06-18 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Wed Jun 18 09:34:27 UTC 2014

Modified Files:
src/sys/dist/ipf/netinet [netbsd-6-1]: ip_fil_netbsd.c
src/sys/net [netbsd-6-1]: if_ethersubr.c if_loop.c if_vlan.c
src/sys/netinet [netbsd-6-1]: if_arp.c ip_carp.c
src/sys/netinet6 [netbsd-6-1]: ip6_flow.c nd6.c
src/sys/rump/librump/rumpkern [netbsd-6-1]: klock.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1067):
sys/dist/ipf/netinet/ip_fil_netbsd.c1.9 via patch
sys/net/if_ethersubr.c  1.197 via patch
sys/net/if_loop.c   1.77 via patch
sys/net/if_vlan.c   1.70 via patch
sys/netinet/if_arp.c1.158
sys/netinet/ip_carp.c   1.54 via patch
sys/netinet6/ip6_flow.c 1.23 via patch
sys/netinet6/nd6.c  1.150 via patch
sys/rump/librump/rumpkern/klock.c   1.4

Make sure *(if_output)() is called with KERNEL_LOCK held to avoid mbuf leak.
See http://mail-index.netbsd.org/tech-net/2014/04/09/msg004511.html
for details. For netinet6, the problem report, fix and test were done
by njoly@ on current-users@


To generate a diff of this commit:
cvs rdiff -u -r1.61.2.1 -r1.61.2.1.2.1 \
src/sys/dist/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.188.8.3 -r1.188.8.3.2.1 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.75 -r1.75.18.1 src/sys/net/if_loop.c
cvs rdiff -u -r1.69 -r1.69.22.1 src/sys/net/if_vlan.c
cvs rdiff -u -r1.154 -r1.154.16.1 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.47.4.1 -r1.47.4.1.6.1 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.19.2.1 -r1.19.2.1.2.1 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.141.8.2 -r1.141.8.3 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.3 -r1.3.20.1 src/sys/rump/librump/rumpkern/klock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dist/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.61.2.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.61.2.1.2.1
--- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.61.2.1	Fri Feb  8 19:54:45 2013
+++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c	Wed Jun 18 09:34:26 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_fil_netbsd.c,v 1.61.2.1 2013/02/08 19:54:45 riz Exp $	*/
+/*	$NetBSD: ip_fil_netbsd.c,v 1.61.2.1.2.1 2014/06/18 09:34:26 msaitoh Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -8,7 +8,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.61.2.1 2013/02/08 19:54:45 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.61.2.1.2.1 2014/06/18 09:34:26 msaitoh Exp $");
 #else
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 2.55.2.67 2009/12/19 05:41:08 darrenr Exp";
@@ -1377,11 +1377,13 @@ fr_fastroute(mb_t *m0, mb_t **mpp, fr_in
 		if (!ip->ip_sum)
 			ip->ip_sum = in_cksum(m, hlen);
 # endif /* M_CSUM_IPv4 */
+		KERNEL_LOCK(1, NULL);
 # if __NetBSD_Version__ >= 499001100
 		error = (*ifp->if_output)(ifp, m, dst, rt);
 # else
 		error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, rt);
 # endif
+		KERNEL_UNLOCK_ONE(NULL);
 		if (i) {
 			ip->ip_len = ntohs(ip->ip_len);
 			ip->ip_off = ntohs(ip->ip_off);
@@ -1471,6 +1473,7 @@ sendorfree:
 	for (m = m0; m; m = m0) {
 		m0 = m->m_act;
 		m->m_act = 0;
+		KERNEL_LOCK(1, NULL);
 # if __NetBSD_Version__ >= 499001100
 		if (error == 0)
 			error = (*ifp->if_output)(ifp, m, dst, rt);
@@ -1483,6 +1486,7 @@ sendorfree:
 		else
 			FREE_MB_T(m);
 # endif
+		KERNEL_UNLOCK_ONE(NULL);
 	}
 }
 done:

Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.188.8.3 src/sys/net/if_ethersubr.c:1.188.8.3.2.1
--- src/sys/net/if_ethersubr.c:1.188.8.3	Wed Oct 31 16:07:46 2012
+++ src/sys/net/if_ethersubr.c	Wed Jun 18 09:34:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.188.8.3 2012/10/31 16:07:46 riz Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.188.8.3.2.1 2014/06/18 09:34:27 msaitoh Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.188.8.3 2012/10/31 16:07:46 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.188.8.3.2.1 2014/06/18 09:34:27 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -222,6 +222,8 @@ ether_output(struct ifnet * const ifp0, 
 	struct at_ifaddr *aa;
 #endif /* NETATALK */
 
+	KASSERT(KERNEL_LOCKED_P());
+
 #ifdef MBUFTRACE
 	m_claimm(m, ifp->if_mowner);
 #endif

Index: src/sys/net/if_loop.c
diff -u src/sys/net/if_loop.c:1.75 src/sys/net/if_loop.c:1.75.18.1
--- src/sys/net/if_loop.c:1.75	Mon Jun 20 09:43:27 2011
+++ src/sys/net/if_loop.c	Wed Jun 18 09:34:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_loop.c,v

CVS commit: [netbsd-6-1] src/doc

2014-06-18 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Wed Jun 18 09:34:45 UTC 2014

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.5

Log Message:
Ticket 1067.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-6.1.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.1.5
diff -u src/doc/CHANGES-6.1.5:1.1.2.10 src/doc/CHANGES-6.1.5:1.1.2.11
--- src/doc/CHANGES-6.1.5:1.1.2.10	Wed Jun 18 02:15:51 2014
+++ src/doc/CHANGES-6.1.5	Wed Jun 18 09:34:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.5,v 1.1.2.10 2014/06/18 02:15:51 msaitoh Exp $
+# $NetBSD: CHANGES-6.1.5,v 1.1.2.11 2014/06/18 09:34:45 msaitoh Exp $
 
 A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5
 release:
@@ -599,3 +599,20 @@ src/external/bsd/openpam/dist/lib/openpa
 	differently installed modules or in the short period during upgrades
 	when module files were being replaced.
 	[christos, ticket #1076]
+
+sys/dist/ipf/netinet/ip_fil_netbsd.c		1.9 via patch
+sys/net/if_ethersubr.c1.197 via patch
+sys/net/if_loop.c1.77 via patch
+sys/net/if_vlan.c1.70 via patch
+sys/netinet/if_arp.c1.158
+sys/netinet/ip_carp.c1.54 via patch
+sys/netinet6/ip6_flow.c1.23 via patch
+sys/netinet6/nd6.c1.150 via patch
+sys/rump/librump/rumpkern/klock.c		1.4
+
+	Make sure *(if_output)() is called with KERNEL_LOCK held to avoid
+	mbuf leak. See
+	http://mail-index.netbsd.org/tech-net/2014/04/09/msg004511.html
+	for details. For netinet6, the problem report, fix and test were done
+	by njoly@ on current-users@
+	[bouyer, ticket #1067]

CVS commit: src/usr.bin/sed

2014-06-18 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Wed Jun 18 09:35:31 UTC 2014

Modified Files:
src/usr.bin/sed: sed.1

Log Message:
Sort options. Use Ss for non-standard headers. New sentence, new line.
Add missing Op.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/sed/sed.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/sed/sed.1
diff -u src/usr.bin/sed/sed.1:1.35 src/usr.bin/sed/sed.1:1.36
--- src/usr.bin/sed/sed.1:1.35	Tue Jun 17 16:39:02 2014
+++ src/usr.bin/sed/sed.1	Wed Jun 18 09:35:31 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sed.1,v 1.35 2014/06/17 16:39:02 christos Exp $
+.\"	$NetBSD: sed.1,v 1.36 2014/06/18 09:35:31 wiz Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -40,11 +40,11 @@
 .Nd stream editor
 .Sh SYNOPSIS
 .Nm
-.Op Fl Ealnru
+.Op Fl aElnru
 .Ar command
 .Op Ar
 .Nm
-.Op Fl Ealnr
+.Op Fl aElnr
 .Op Fl e Ar command
 .Op Fl f Ar command_file
 .Op Fl I Op Ar extension
@@ -69,12 +69,6 @@ regardless of their origin.
 .Pp
 The following options are available:
 .Bl -tag -width indent
-.It Fl E
-Interpret regular expressions as extended (modern) regular expressions
-rather than basic regular expressions (BRE's).
-The
-.Xr re_format 7
-manual page fully describes both formats.
 .It Fl a
 The files listed as parameters for the
 .Dq w
@@ -87,6 +81,12 @@ option causes
 to delay opening each file until a command containing the related
 .Dq w
 function is applied to a line of input.
+.It Fl E
+Interpret regular expressions as extended (modern) regular expressions
+rather than basic regular expressions (BRE's).
+The
+.Xr re_format 7
+manual page fully describes both formats.
 .It Fl e Ar command
 Append the editing commands specified by the
 .Ar command
@@ -123,7 +123,7 @@ That can lead to unexpected results in m
 where using
 .Fl i
 is desired.
-.It Fl i Ar extension
+.It Fl i Op Ar extension
 Edit files in-place similarly to
 .Fl I ,
 but treat each file independently from other files.
@@ -177,7 +177,7 @@ deletes the pattern space.
 Some of the functions use a
 .Em "hold space"
 to save all or part of the pattern space for subsequent retrieval.
-.Sh "Sed Addresses"
+.Ss "Sed Addresses"
 An address is not required, but if specified must have one of the
 following formats:
 .Bl -bullet -offset indent
@@ -198,7 +198,8 @@ option was specified);
 .It
 a context address
 that consists of a regular expression preceded and followed by a
-delimiter. The closing delimiter can also optionally be followed by the
+delimiter.
+The closing delimiter can also optionally be followed by the
 .Dq i
 character, to indicate that the regular expression is to be matched
 in a case-insensitive way.
@@ -235,7 +236,7 @@ Editing commands can be applied to non-s
 of the exclamation character
 .Pq Dq \&!
 function.
-.Sh "Sed Regular Expressions"
+.Ss "Sed Regular Expressions"
 The regular expressions used in
 .Nm ,
 by default, are basic regular expressions (BREs, see
@@ -292,7 +293,7 @@ will substitute
 .Dq XXX
 for the pattern
 .Dq abc .
-.Sh "Sed Functions"
+.Ss "Sed Functions"
 In the following list of commands, the maximum number of permissible
 addresses for each command is indicated by [0addr], [1addr], or [2addr],
 representing zero, one, or two addresses.
@@ -601,7 +602,7 @@ utility is expected to be a superset of 
 specification.
 .Pp
 The
-.Fl E , I , a
+.Fl a , E , I ,
 and
 .Fl i
 options, the prefixing

CVS commit: [netbsd-6-0] src/sys

2014-06-18 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Wed Jun 18 09:35:40 UTC 2014

Modified Files:
src/sys/dist/ipf/netinet [netbsd-6-0]: ip_fil_netbsd.c
src/sys/net [netbsd-6-0]: if_ethersubr.c if_loop.c if_vlan.c
src/sys/netinet [netbsd-6-0]: if_arp.c ip_carp.c
src/sys/netinet6 [netbsd-6-0]: ip6_flow.c nd6.c
src/sys/rump/librump/rumpkern [netbsd-6-0]: klock.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1067):
sys/dist/ipf/netinet/ip_fil_netbsd.c1.9 via patch
sys/net/if_ethersubr.c  1.197 via patch
sys/net/if_loop.c   1.77 via patch
sys/net/if_vlan.c   1.70 via patch
sys/netinet/if_arp.c1.158
sys/netinet/ip_carp.c   1.54 via patch
sys/netinet6/ip6_flow.c 1.23 via patch
sys/netinet6/nd6.c  1.150 via patch
sys/rump/librump/rumpkern/klock.c   1.4

Make sure *(if_output)() is called with KERNEL_LOCK held to avoid mbuf leak.
See http://mail-index.netbsd.org/tech-net/2014/04/09/msg004511.html
for details. For netinet6, the problem report, fix and test were done
by njoly@ on current-users@


To generate a diff of this commit:
cvs rdiff -u -r1.61.6.1 -r1.61.6.2 src/sys/dist/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.188.8.2 -r1.188.8.2.4.1 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.75 -r1.75.14.1 src/sys/net/if_loop.c
cvs rdiff -u -r1.69 -r1.69.14.1 src/sys/net/if_vlan.c
cvs rdiff -u -r1.154 -r1.154.8.1 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.47.4.1 -r1.47.4.1.4.1 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.141.6.2 -r1.141.6.3 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.3 -r1.3.18.1 src/sys/rump/librump/rumpkern/klock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dist/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.61.6.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.61.6.2
--- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.61.6.1	Fri Feb  8 19:55:11 2013
+++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c	Wed Jun 18 09:35:39 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_fil_netbsd.c,v 1.61.6.1 2013/02/08 19:55:11 riz Exp $	*/
+/*	$NetBSD: ip_fil_netbsd.c,v 1.61.6.2 2014/06/18 09:35:39 msaitoh Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -8,7 +8,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.61.6.1 2013/02/08 19:55:11 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.61.6.2 2014/06/18 09:35:39 msaitoh Exp $");
 #else
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 2.55.2.67 2009/12/19 05:41:08 darrenr Exp";
@@ -1377,11 +1377,13 @@ fr_fastroute(mb_t *m0, mb_t **mpp, fr_in
 		if (!ip->ip_sum)
 			ip->ip_sum = in_cksum(m, hlen);
 # endif /* M_CSUM_IPv4 */
+		KERNEL_LOCK(1, NULL);
 # if __NetBSD_Version__ >= 499001100
 		error = (*ifp->if_output)(ifp, m, dst, rt);
 # else
 		error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, rt);
 # endif
+		KERNEL_UNLOCK_ONE(NULL);
 		if (i) {
 			ip->ip_len = ntohs(ip->ip_len);
 			ip->ip_off = ntohs(ip->ip_off);
@@ -1471,6 +1473,7 @@ sendorfree:
 	for (m = m0; m; m = m0) {
 		m0 = m->m_act;
 		m->m_act = 0;
+		KERNEL_LOCK(1, NULL);
 # if __NetBSD_Version__ >= 499001100
 		if (error == 0)
 			error = (*ifp->if_output)(ifp, m, dst, rt);
@@ -1483,6 +1486,7 @@ sendorfree:
 		else
 			FREE_MB_T(m);
 # endif
+		KERNEL_UNLOCK_ONE(NULL);
 	}
 }
 done:

Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.188.8.2 src/sys/net/if_ethersubr.c:1.188.8.2.4.1
--- src/sys/net/if_ethersubr.c:1.188.8.2	Mon Aug 20 19:23:07 2012
+++ src/sys/net/if_ethersubr.c	Wed Jun 18 09:35:39 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.188.8.2 2012/08/20 19:23:07 riz Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.188.8.2.4.1 2014/06/18 09:35:39 msaitoh Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.188.8.2 2012/08/20 19:23:07 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.188.8.2.4.1 2014/06/18 09:35:39 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -222,6 +222,8 @@ ether_output(struct ifnet * const ifp0, 
 	struct at_ifaddr *aa;
 #endif /* NETATALK */
 
+	KASSERT(KERNEL_LOCKED_P());
+
 #ifdef MBUFTRACE
 	m_claimm(m, ifp->if_mowner);
 #endif

Index: src/sys/net/if_loop.c
diff -u src/sys/net/if_loop.c:1.75 src/sys/net/if_loop.c:1.75.14.1
--- src/sys/net/if_loop.c:1.75	Mon Jun 20 09:43:27 2011
+++ src/sys/net/if_loop.c	Wed Jun 18 09:35:39 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_loop.c,v 1.75 2011/06/20 09:43:27 kefre

CVS commit: [netbsd-6-0] src/doc

2014-06-18 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Wed Jun 18 09:35:59 UTC 2014

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.6

Log Message:
Ticket 1067.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-6.0.6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0.6
diff -u src/doc/CHANGES-6.0.6:1.1.2.10 src/doc/CHANGES-6.0.6:1.1.2.11
--- src/doc/CHANGES-6.0.6:1.1.2.10	Wed Jun 18 02:20:05 2014
+++ src/doc/CHANGES-6.0.6	Wed Jun 18 09:35:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.6,v 1.1.2.10 2014/06/18 02:20:05 msaitoh Exp $
+# $NetBSD: CHANGES-6.0.6,v 1.1.2.11 2014/06/18 09:35:59 msaitoh Exp $
 
 A complete list of changes from the NetBSD 6.0.5 release to the NetBSD 6.0.6
 release:
@@ -599,3 +599,20 @@ src/external/bsd/openpam/dist/lib/openpa
 	differently installed modules or in the short period during upgrades
 	when module files were being replaced.
 	[christos, ticket #1076]
+
+sys/dist/ipf/netinet/ip_fil_netbsd.c		1.9 via patch
+sys/net/if_ethersubr.c1.197 via patch
+sys/net/if_loop.c1.77 via patch
+sys/net/if_vlan.c1.70 via patch
+sys/netinet/if_arp.c1.158
+sys/netinet/ip_carp.c1.54 via patch
+sys/netinet6/ip6_flow.c1.23 via patch
+sys/netinet6/nd6.c1.150 via patch
+sys/rump/librump/rumpkern/klock.c		1.4
+
+	Make sure *(if_output)() is called with KERNEL_LOCK held to avoid
+	mbuf leak. See
+	http://mail-index.netbsd.org/tech-net/2014/04/09/msg004511.html
+	for details. For netinet6, the problem report, fix and test were done
+	by njoly@ on current-users@
+	[bouyer, ticket #1067]

CVS commit: src/usr.bin/sed

2014-06-18 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Wed Jun 18 09:41:29 UTC 2014

Modified Files:
src/usr.bin/sed: main.c

Log Message:
Sync usage with manpage.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/sed/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/sed/main.c
diff -u src/usr.bin/sed/main.c:1.25 src/usr.bin/sed/main.c:1.26
--- src/usr.bin/sed/main.c:1.25	Tue Jun 17 16:39:02 2014
+++ src/usr.bin/sed/main.c	Wed Jun 18 09:41:29 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.25 2014/06/17 16:39:02 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.26 2014/06/18 09:41:29 wiz Exp $	*/
 
 /*-
  * Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -39,7 +39,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: main.c,v 1.25 2014/06/17 16:39:02 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.26 2014/06/18 09:41:29 wiz Exp $");
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $");
 #endif
@@ -219,9 +219,9 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-	"Usage: %s script [-Ealnu] [-i[]] [file ...]\n"
-	"\t%s [-Ealnu] [-i[]] [-e script] ... [-f script_file]"
-	" ... [file ...]\n", getprogname(), getprogname());
+	"Usage:  %s [-aElnru] command [file ...]\n"
+	"\t%s [-aElnr] [-e command] [-f command_file] [-I [extension]]\n"
+	"\t[-i [extension]] [file ...]\n", getprogname(), getprogname());
 	exit(1);
 }

CVS commit: src/sys/net

2014-06-18 Thread Ryota Ozaki 
Module Name:src
Committed By:   ozaki-r
Date:   Wed Jun 18 10:51:03 UTC 2014

Modified Files:
src/sys/net: if_bridge.c

Log Message:
Restructure bridge_input and bridge_broadcast

There are two changes:
- Assemble the places calling pktq_enqueue (bridge_forward)
  for unicast and {b,m}cast frames into one
- Receive {b,m}cast frames in bridge_broadcast, not in
  bridge_input

The changes make the code clear and readable. bridge_input
now doesn't need to take care of {b,m}cast frames;
bridge_forward and bridge_broadcast have the responsibility.

The changes are based on a patch of Lloyd Parkes submitted
in PR 48104, but don't fix its issue yet.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/net/if_bridge.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.82 src/sys/net/if_bridge.c:1.83
--- src/sys/net/if_bridge.c:1.82	Wed Jun 18 09:20:46 2014
+++ src/sys/net/if_bridge.c	Wed Jun 18 10:51:03 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bridge.c,v 1.82 2014/06/18 09:20:46 ozaki-r Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.83 2014/06/18 10:51:03 ozaki-r Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.82 2014/06/18 09:20:46 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.83 2014/06/18 10:51:03 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
@@ -1612,7 +1612,6 @@ bridge_input(struct ifnet *ifp, struct m
 	struct bridge_softc *sc = ifp->if_bridge;
 	struct bridge_iflist *bif;
 	struct ether_header *eh;
-	struct mbuf *mc;
 
 	if ((sc->sc_if.if_flags & IFF_RUNNING) == 0) {
 		ether_input(ifp, m);
@@ -1635,68 +1634,50 @@ bridge_input(struct ifnet *ifp, struct m
 			m->m_flags |= M_MCAST;
 	}
 
-	if (m->m_flags & (M_BCAST|M_MCAST)) {
-		if (bif->bif_flags & IFBIF_STP) {
-			/* Tap off 802.1D packets; they do not get forwarded. */
-			if (memcmp(eh->ether_dhost, bstp_etheraddr,
-			ETHER_ADDR_LEN) == 0) {
-bstp_input(sc, bif, m);
+	/*
+	 * A 'fast' path for packets addressed to interfaces that are
+	 * part of this bridge.
+	 */
+	if (!(m->m_flags & (M_BCAST|M_MCAST)) &&
+	!bstp_state_before_learning(bif)) {
+		struct bridge_iflist *_bif;
+
+		LIST_FOREACH(_bif, &sc->sc_iflist, bif_next) {
+			/* It is destined for us. */
+			if (bridge_ourether(_bif, eh, 0)) {
+if (_bif->bif_flags & IFBIF_LEARNING)
+	(void) bridge_rtupdate(sc,
+	eh->ether_shost, ifp, 0, IFBAF_DYNAMIC);
+m->m_pkthdr.rcvif = _bif->bif_ifp;
+ether_input(_bif->bif_ifp, m);
 return;
 			}
 
-			if (bstp_state_before_learning(bif)) {
-ether_input(ifp, m);
+			/* We just received a packet that we sent out. */
+			if (bridge_ourether(_bif, eh, 1)) {
+m_freem(m);
 return;
 			}
 		}
-
-		/*
-		 * Make a deep copy of the packet and enqueue the copy
-		 * for bridge processing; return the original packet for
-		 * local processing.
-		 */
-		mc = m_dup(m, 0, M_COPYALL, M_NOWAIT);
-		if (mc == NULL) {
-			ether_input(ifp, m);
-			return;
-		}
-
-		/* Perform the bridge forwarding function with the copy. */
-		if (__predict_false(!pktq_enqueue(sc->sc_fwd_pktq, mc, 0)))
-			m_freem(mc);
-
-		/* For local processing. */
-		ether_input(ifp, m);
-		return;
 	}
 
-	if (bstp_state_before_learning(bif)) {
-		ether_input(ifp, m);
+	/* Tap off 802.1D packets; they do not get forwarded. */
+	if (bif->bif_flags & IFBIF_STP &&
+	memcmp(eh->ether_dhost, bstp_etheraddr, ETHER_ADDR_LEN) == 0) {
+		bstp_input(sc, bif, m);
 		return;
 	}
 
 	/*
-	 * Unicast.  Make sure it's not for us.
+	 * A normal switch would discard the packet here, but that's not what
+	 * we've done historically. This also prevents some obnoxious behaviour.
 	 */
-	LIST_FOREACH(bif, &sc->sc_iflist, bif_next) {
-		/* It is destined for us. */
-		if (bridge_ourether(bif, eh, 0)) {
-			if (bif->bif_flags & IFBIF_LEARNING)
-(void) bridge_rtupdate(sc,
-eh->ether_shost, ifp, 0, IFBAF_DYNAMIC);
-			m->m_pkthdr.rcvif = bif->bif_ifp;
-			ether_input(bif->bif_ifp, m);
-			return;
-		}
-
-		/* We just received a packet that we sent out. */
-		if (bridge_ourether(bif, eh, 1)) {
-			m_freem(m);
-			return;
-		}
+	if (bstp_state_before_learning(bif)) {
+		ether_input(ifp, m);
+		return;
 	}
 
-	/* Perform the bridge forwarding function. */
+	/* Queue the packet for bridge forwarding. */
 	if (__predict_false(!pktq_enqueue(sc->sc_fwd_pktq, m, 0)))
 		m_freem(m);
 }
@@ -1715,7 +1696,9 @@ bridge_broadcast(struct bridge_softc *sc
 	struct bridge_iflist *bif;
 	struct mbuf *mc;
 	struct ifnet *dst_if;
-	int used = 0;
+	bool used, bmcast;
+
+	used = bmcast = m->m_flags & (M_BCAST|M_MCAST);
 
 	LIST_FOREACH(bif, &sc->sc_iflist, bif_next) {
 		dst_if = bif->bif_ifp;
@@ -1730,16 +1713,15 @@ bridge_broadcast(struct bridge_softc *sc
 			}
 		}
 
-		if ((bif->bif_flags & IF

CVS commit: src/lib/libedit

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 13:03:08 UTC 2014

Modified Files:
src/lib/libedit: vi.c

Log Message:
accomodate FreeBSD's flavor of weak references.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libedit/vi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/vi.c
diff -u src/lib/libedit/vi.c:1.43 src/lib/libedit/vi.c:1.44
--- src/lib/libedit/vi.c:1.43	Mon Jan 16 09:57:45 2012
+++ src/lib/libedit/vi.c	Wed Jun 18 09:03:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: vi.c,v 1.43 2012/01/16 14:57:45 christos Exp $	*/
+/*	$NetBSD: vi.c,v 1.44 2014/06/18 13:03:08 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vi.c,v 1.43 2012/01/16 14:57:45 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.44 2014/06/18 13:03:08 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -918,15 +918,24 @@ vi_comment_out(EditLine *el, Int c __att
  * NB: posix implies that we should enter insert mode, however
  * this is against historical precedent...
  */
-#ifdef __weak_reference
-__weakref_visible char *my_get_alias_text(const char *)
-__weak_reference(get_alias_text);
+#if defined(__weak_reference)
+# define libedit_weak(a) __weak_reference(a)
+# define libedit_weak_visible __weakref_visible
+#elif defined(__weak_extern)
+# define libedit_weak(a) __weak_extern(a)
+# define libedit_weak_visible
 #endif
+
+#ifdef libedit_weak
+libedit_weak_visible
+char *my_get_alias_text(const char *) libedit_weak(get_alias_text);
+#endif
+
 protected el_action_t
 /*ARGSUSED*/
 vi_alias(EditLine *el, Int c __attribute__((__unused__)))
 {
-#ifdef __weak_reference
+#ifdef libedit_weak
 	char alias_name[3];
 	char *alias_text;

CVS commit: src/usr.bin/sed

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 14:12:20 UTC 2014

Modified Files:
src/usr.bin/sed: sed.1

Log Message:
fix second line of synopsis.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/sed/sed.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/sed/sed.1
diff -u src/usr.bin/sed/sed.1:1.36 src/usr.bin/sed/sed.1:1.37
--- src/usr.bin/sed/sed.1:1.36	Wed Jun 18 05:35:31 2014
+++ src/usr.bin/sed/sed.1	Wed Jun 18 10:12:20 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sed.1,v 1.36 2014/06/18 09:35:31 wiz Exp $
+.\"	$NetBSD: sed.1,v 1.37 2014/06/18 14:12:20 christos Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -32,7 +32,7 @@
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
 .\" $FreeBSD: head/usr.bin/sed/sed.1 259132 2013-12-09 18:57:20Z eadler $
 .\"
-.Dd June 17, 2014
+.Dd June 18, 2014
 .Dt SED 1
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .Ar command
 .Op Ar
 .Nm
-.Op Fl aElnr
+.Op Fl aElnru
 .Op Fl e Ar command
 .Op Fl f Ar command_file
 .Op Fl I Op Ar extension

CVS commit: src/usr.bin/sed

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 14:15:50 UTC 2014

Modified Files:
src/usr.bin/sed: main.c

Log Message:
Fix usage. The man page is incorrect with respect to -I and -i and need
fixing, but my troff foo is not there.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/sed/main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/sed/main.c
diff -u src/usr.bin/sed/main.c:1.26 src/usr.bin/sed/main.c:1.27
--- src/usr.bin/sed/main.c:1.26	Wed Jun 18 05:41:29 2014
+++ src/usr.bin/sed/main.c	Wed Jun 18 10:15:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.26 2014/06/18 09:41:29 wiz Exp $	*/
+/*	$NetBSD: main.c,v 1.27 2014/06/18 14:15:50 christos Exp $	*/
 
 /*-
  * Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -39,7 +39,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: main.c,v 1.26 2014/06/18 09:41:29 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.27 2014/06/18 14:15:50 christos Exp $");
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $");
 #endif
@@ -220,8 +220,8 @@ usage(void)
 {
 	(void)fprintf(stderr,
 	"Usage:  %s [-aElnru] command [file ...]\n"
-	"\t%s [-aElnr] [-e command] [-f command_file] [-I [extension]]\n"
-	"\t[-i [extension]] [file ...]\n", getprogname(), getprogname());
+	"\t%s [-aElnru] [-e command] [-f command_file] [-I[extension]]\n"
+	"\t[-i[extension]] [file ...]\n", getprogname(), getprogname());
 	exit(1);
 }

CVS commit: src/usr.bin/sed

2014-06-18 Thread Valeriy E. Ushakov 
Module Name:src
Committed By:   uwe
Date:   Wed Jun 18 14:26:15 UTC 2014

Modified Files:
src/usr.bin/sed: sed.1

Log Message:
Suppress space after -I and -i options.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/sed/sed.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/sed/sed.1
diff -u src/usr.bin/sed/sed.1:1.37 src/usr.bin/sed/sed.1:1.38
--- src/usr.bin/sed/sed.1:1.37	Wed Jun 18 14:12:20 2014
+++ src/usr.bin/sed/sed.1	Wed Jun 18 14:26:15 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sed.1,v 1.37 2014/06/18 14:12:20 christos Exp $
+.\"	$NetBSD: sed.1,v 1.38 2014/06/18 14:26:15 uwe Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -47,8 +47,8 @@
 .Op Fl aElnru
 .Op Fl e Ar command
 .Op Fl f Ar command_file
-.Op Fl I Op Ar extension
-.Op Fl i Op Ar extension
+.Op Fl I Ns Op Ar extension
+.Op Fl i Ns Op Ar extension
 .Op Ar
 .Sh DESCRIPTION
 The

CVS commit: src/usr.bin/sed

2014-06-18 Thread Valeriy E. Ushakov 
Module Name:src
Committed By:   uwe
Date:   Wed Jun 18 14:47:02 UTC 2014

Modified Files:
src/usr.bin/sed: sed.1

Log Message:
Suppress space after -I and -i options in description too.
XXX: This should be documented explicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/sed/sed.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/sed/sed.1
diff -u src/usr.bin/sed/sed.1:1.38 src/usr.bin/sed/sed.1:1.39
--- src/usr.bin/sed/sed.1:1.38	Wed Jun 18 14:26:15 2014
+++ src/usr.bin/sed/sed.1	Wed Jun 18 14:47:02 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sed.1,v 1.38 2014/06/18 14:26:15 uwe Exp $
+.\"	$NetBSD: sed.1,v 1.39 2014/06/18 14:47:02 uwe Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -97,7 +97,7 @@ Append the editing commands found in the
 .Ar command_file
 to the list of commands.
 The editing commands should each be listed on a separate line.
-.It Fl I Op Ar extension
+.It Fl I Ns Op Ar extension
 Edit files in-place, saving backups with the specified
 .Ar extension .
 If no
@@ -123,7 +123,7 @@ That can lead to unexpected results in m
 where using
 .Fl i
 is desired.
-.It Fl i Op Ar extension
+.It Fl i Ns Op Ar extension
 Edit files in-place similarly to
 .Fl I ,
 but treat each file independently from other files.

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus

2014-06-18 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Wed Jun 18 16:49:46 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus:
netbsdSbus.c

Log Message:
OFIOCNEXTPROP -> OFIOCGET
now this can actually work


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.3	Wed Apr 13 05:14:00 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c	Wed Jun 18 16:49:46 2014
@@ -117,7 +117,7 @@ promGetProperty(const char *prop, int *l
 ofio.of_buf = of_buf;
 ofio.of_buflen = sizeof(of_buf);
 
-if (ioctl(promFd, OFIOCNEXTPROP, &ofio) < 0)
+if (ioctl(promFd, OFIOCGET, &ofio) < 0)
 	return 0;
 
 of_buf[ofio.of_buflen] = '\0';
@@ -137,10 +137,9 @@ promGetBool(const char *prop)
 ofio.of_buf = of_buf;
 ofio.of_buflen = sizeof(of_buf);
 
-if (ioctl(promFd, OFIOCNEXTPROP, &ofio) < 0)
+if (ioctl(promFd, OFIOCGET, &ofio) < 0)
 	return 0;
-
-if (!ofio.of_buflen)
+if (ofio.of_buflen < 0)
 	return 0;
 
 return 1;
@@ -160,12 +159,15 @@ promSetNode(sbusPromNodePtr pnode)
 
 if (!pnode->node || pnode->node == -1)
 	return -1;
+
 if (pnode->cookie[0] & PROM_NODE_SIBLING)
 	node = promGetSibling(pnode->cookie[1]);
 else
 	node = promGetChild(pnode->cookie[1]);
+
 if (pnode->node != node)
 	return -1;
+
 return 0;
 }
 
@@ -197,14 +199,17 @@ sparcPromInit(void)
 	promOpenCount++;
 	return 0;
 }
+
 promFd = open("/dev/openprom", O_RDONLY, 0);
 if (promFd == -1)
 	return -1;
+
 promRootNode = promGetSibling(0);
 if (!promRootNode) {
 	sparcPromClose();
 	return -1;
 }
+
 promIsP1275();
 promOpenCount++;
 
@@ -214,17 +219,19 @@ sparcPromInit(void)
 char *
 sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp)
 {
-if (promSetNode(pnode))
+ if (promSetNode(pnode))
 	return NULL;
-return promGetProperty(prop, lenp);
+
+ return promGetProperty(prop, lenp);
 }
 
 int
 sparcPromGetBool(sbusPromNodePtr pnode, const char *prop)
 {
-if (promSetNode(pnode))
+ if (promSetNode(pnode))
 	return 0;
-return promGetBool(prop);
+
+ return promGetBool(prop);
 }
 
 static void
@@ -242,14 +249,18 @@ promWalkAssignNodes(int node, int oldnod
 	prop = promGetProperty("name", &len);
 	if (!prop || len <= 0)
 		break;
+
 	while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
 		prop++;
+
 	for (i = 0; sbusDeviceTable[i].devId; i++)
 		if (!strcmp(prop, sbusDeviceTable[i].promName))
 		break;
+
 	devId = sbusDeviceTable[i].devId;
-	if (!devId)
+	if(!devId)
 		break;
+
 	if (!sbus) {
 		if (devId == SBUS_DEVICE_FFB) {
 		/*
@@ -261,13 +272,16 @@ promWalkAssignNodes(int node, int oldnod
 		} else if (devId != SBUS_DEVICE_CG14)
 		break;
 	}
+
 	for (i = 0; i < 32; i++) {
 		if (!devicePtrs[i] || devicePtrs[i]->devId != devId)
 		continue;
+
 		if (devicePtrs[i]->node.node) {
 		if ((devicePtrs[i]->node.cookie[0] & ~PROM_NODE_SIBLING) <=
 			(flags & ~PROM_NODE_SIBLING))
 			continue;
+
 		for (j = i + 1, pNode = devicePtrs[i]->node; j < 32; j++) {
 			if (!devicePtrs[j] || devicePtrs[j]->devId != devId)
 			continue;

CVS commit: xsrc/external/mit/xf86-video-suntcx/dist/src

2014-06-18 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Wed Jun 18 16:55:28 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx.h tcx_driver.c

Log Message:
make this work properly on 8bit SUNW,tcx


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.4 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.5
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.4	Tue Jun  4 22:20:42 2013
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h	Wed Jun 18 16:55:28 2014
@@ -37,6 +37,8 @@
 /* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
 #define TCX_RAM8_VOFF		0x
 #define TCX_RAM24_VOFF		0x0100
+#define	TCX_STIP_VOFF		0x1000
+#define	TCX_BLIT_VOFF		0x2000
 #define TCX_CPLANE_VOFF		0x2800
 #define	TCX_RSTIP_VOFF		0x3000
 #define	TCX_RBLIT_VOFF		0x3800
@@ -56,6 +58,7 @@ typedef struct {
 	sbusDevicePtr	psdp;
 	CloseScreenProcPtr CloseScreen;
 	Bool		HWCursor;
+	Bool		Is8bit;
 	uint64_t	*rblit;
 	uint64_t	*rstip;
 	xf86CursorInfoPtr CursorInfoRec;

Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.6 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.7
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.6	Tue Jun  4 22:20:42 2013
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c	Wed Jun 18 16:55:28 2014
@@ -341,12 +341,13 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
 **/
 hwCursor = 0;
 lowDepth = 1;
-if (sparcPromInit() >= 0) {
-	hwCursor = sparcPromGetBool(&psdp->node, "hw-cursor");
-	lowDepth = sparcPromGetBool(&psdp->node, "tcx-8-bit");
-	sparcPromClose();
+ if (sparcPromInit() >= 0) {
+ 	hwCursor = sparcPromGetBool(&psdp->node, "hw-cursor");
+ 	lowDepth = sparcPromGetBool(&psdp->node, "tcx-8-bit");
+ 	sparcPromClose();
 }
 
+pTcx->Is8bit = (lowDepth != 0); 
 /* all S24 support a hardware cursor */
 if (!lowDepth)
 	hwCursor = 1;
@@ -357,7 +358,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
 deal with depth
 */
 
-if (!xf86SetDepthBpp(pScrn, 0, 0, 0,
+if (!xf86SetDepthBpp(pScrn, lowDepth ? 8 : 0, 0, 0,
 			 lowDepth ? NoDepth24Support : Support32bppFb)) {
 	return FALSE;
 } else {
@@ -524,15 +525,30 @@ TCXScreenInit(SCREEN_INIT_ARGS_DECL)
 	return FALSE;
 }
 
-pTcx->rblit = xf86MapSbusMem(pTcx->psdp, TCX_RBLIT_VOFF, 8 * 1024 * 1024);
-if (pTcx->rblit == NULL) {
-	xf86Msg(X_ERROR, "Couldn't map RBLIT space\n");
-	return FALSE;
-}
-pTcx->rstip = xf86MapSbusMem(pTcx->psdp, TCX_RSTIP_VOFF, 8 * 1024 * 1024);
-if (pTcx->rstip == NULL) {
-	xf86Msg(X_ERROR, "Couldn't map RSTIP space\n");
-	return FALSE;
+if (pTcx->Is8bit) {
+	/* use STIP and BLIT on tcx */
+pTcx->rblit = xf86MapSbusMem(pTcx->psdp, TCX_BLIT_VOFF, 8 * 1024 * 1024);
+if (pTcx->rblit == NULL) {
+	xf86Msg(X_ERROR, "Couldn't map BLIT space\n");
+	return FALSE;
+}
+pTcx->rstip = xf86MapSbusMem(pTcx->psdp, TCX_STIP_VOFF, 8 * 1024 * 1024);
+if (pTcx->rstip == NULL) {
+	xf86Msg(X_ERROR, "Couldn't map STIP space\n");
+	return FALSE;
+	}
+} else {
+	/* use RSTIP and RBLIT on S24 */
+pTcx->rblit = xf86MapSbusMem(pTcx->psdp, TCX_RBLIT_VOFF, 8 * 1024 * 1024);
+if (pTcx->rblit == NULL) {
+	xf86Msg(X_ERROR, "Couldn't map RBLIT space\n");
+	return FALSE;
+}
+pTcx->rstip = xf86MapSbusMem(pTcx->psdp, TCX_RSTIP_VOFF, 8 * 1024 * 1024);
+if (pTcx->rstip == NULL) {
+	xf86Msg(X_ERROR, "Couldn't map RSTIP space\n");
+	return FALSE;
+	}
 }
 
 if (! pTcx->fb)
@@ -605,9 +621,7 @@ TCXScreenInit(SCREEN_INIT_ARGS_DECL)
 fbPictureInit (pScreen, 0, 0);
 #endif
 
-#if 0
-if (!pTcx->NoAccel)
-{
+if (!pTcx->NoAccel) {
 XF86ModReqInfo req;
 int errmaj, errmin;
 
@@ -625,7 +639,7 @@ TCXScreenInit(SCREEN_INIT_ARGS_DECL)
 }
 
 miInitializeBackingStore(pScreen);
-#endif
+
 xf86SetBackingStore(pScreen);
 xf86SetSilkenMouse(pScreen);

CVS commit: src/lib/libc

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 17:47:58 UTC 2014

Modified Files:
src/lib/libc: shlib_version
src/lib/libc/stdio: Makefile.inc gettemp.c local.h mkdtemp.c mkstemp.c
mktemp.3 mktemp.c
Added Files:
src/lib/libc/stdio: gettemp.h mkostemp.c mkostemps.c mkstemps.c

Log Message:
add mkostemp, mkostemps, mkstemps from FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/lib/libc/shlib_version
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/stdio/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/stdio/gettemp.c
cvs rdiff -u -r0 -r1.1 src/lib/libc/stdio/gettemp.h \
src/lib/libc/stdio/mkostemp.c src/lib/libc/stdio/mkostemps.c \
src/lib/libc/stdio/mkstemps.c
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/stdio/local.h
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/stdio/mkdtemp.c \
src/lib/libc/stdio/mkstemp.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/stdio/mktemp.3
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/stdio/mktemp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/shlib_version
diff -u src/lib/libc/shlib_version:1.251 src/lib/libc/shlib_version:1.252
--- src/lib/libc/shlib_version:1.251	Fri Jun 13 11:45:05 2014
+++ src/lib/libc/shlib_version	Wed Jun 18 13:47:58 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.251 2014/06/13 15:45:05 joerg Exp $
+#	$NetBSD: shlib_version,v 1.252 2014/06/18 17:47:58 christos Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 # things we wish to do on next major version bump:
@@ -41,4 +41,4 @@
 # - redo stdin/stdout/stderr to not require copy relocations
 # - move gethostbyname to a compat library
 major=12
-minor=191
+minor=192

Index: src/lib/libc/stdio/Makefile.inc
diff -u src/lib/libc/stdio/Makefile.inc:1.43 src/lib/libc/stdio/Makefile.inc:1.44
--- src/lib/libc/stdio/Makefile.inc:1.43	Thu Jan 16 15:31:43 2014
+++ src/lib/libc/stdio/Makefile.inc	Wed Jun 18 13:47:58 2014
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.inc	5.7 (Berkeley) 6/27/91
-#	$NetBSD: Makefile.inc,v 1.43 2014/01/16 20:31:43 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.44 2014/06/18 17:47:58 christos Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/stdio
@@ -13,8 +13,9 @@ SRCS+=	clrerr.c dprintf.c fclose.c fdope
 	fread.c freopen.c fscanf.c fseek.c fseeko.c fsetpos.c ftell.c ftello.c \
 	funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwrite.c fwscanf.c \
 	getc.c getchar.c getdelim.c getline.c gettemp.c getw.c getwc.c \
-	getwchar.c makebuf.c mkdtemp.c mkstemp.c perror.c printf.c putc.c \
-	putchar.c puts.c putw.c putwc.c putwchar.c refill.c remove.c rewind.c \
+	getwchar.c makebuf.c mkdtemp.c mkstemp.c mkstemps.c mkostemp.c \
+	mkostemps.c perror.c printf.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 setvbuf.c snprintf_ss.c \
 	sscanf.c stdio.c swprintf.c swscanf.c tmpfile.c ungetc.c ungetwc.c \
 	vasprintf.c vdprintf.c vfprintf.c vfscanf.c vfwprintf.c vfwscanf.c \

Index: src/lib/libc/stdio/gettemp.c
diff -u src/lib/libc/stdio/gettemp.c:1.17 src/lib/libc/stdio/gettemp.c:1.18
--- src/lib/libc/stdio/gettemp.c:1.17	Tue Jan 21 14:09:48 2014
+++ src/lib/libc/stdio/gettemp.c	Wed Jun 18 13:47:58 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: gettemp.c,v 1.17 2014/01/21 19:09:48 seanb Exp $	*/
+/*	$NetBSD: gettemp.c,v 1.18 2014/06/18 17:47:58 christos Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -29,9 +29,7 @@
  * SUCH DAMAGE.
  */
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
+#include "gettemp.h"
 
 #if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP
 
@@ -40,129 +38,119 @@
 #if 0
 static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: gettemp.c,v 1.17 2014/01/21 19:09:48 seanb Exp $");
+__RCSID("$NetBSD: gettemp.c,v 1.18 2014/06/18 17:47:58 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#include 
-#include 
-
-#include 
-#include 
-#include 
+#include 
 #include 
-#include 
-#include 
-#include 
+#include 
 
-#if HAVE_NBTOOL_CONFIG_H
-#define	GETTEMP		__nbcompat_gettemp
-#else
-#include "reentrant.h"
-#include "local.h"
-#define	GETTEMP		__gettemp
-#endif
+static const unsigned char padchar[] =
+"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
 int
-GETTEMP(char *path, int *doopen, int domkdir)
+GETTEMP(char *path, int *doopen, int domkdir, int slen, int oflags)
 {
-	char *start, *trv;
+	char *start, *trv, *suffp, *carryp;
+	char *pad;
 	struct stat sbuf;
-	u_int pid;
-
-	/* To guarantee multiple calls generate unique names even if
-	   the file is not created. 676 different possibilities with 7
-	   or more X's, 26 with 6 or less. */
-	static char xtra[2] = "aa";
-	int xcnt = 0;
+	int rval;
+	uint32_t rand;
+	char carrybuf[MAXPATHLEN];
 
 	_DIAGASSERT(path != NULL);
 	/* doopen may be NULL */
+	if ((doopen != NULL && domkdir) || slen < 0 ||
+	(ofl

CVS commit: src/include

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 17:48:22 UTC 2014

Modified Files:
src/include: stdlib.h unistd.h

Log Message:
add mkostemp{s,} mkstemps from FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/include/stdlib.h
cvs rdiff -u -r1.140 -r1.141 src/include/unistd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/stdlib.h
diff -u src/include/stdlib.h:1.109 src/include/stdlib.h:1.110
--- src/include/stdlib.h:1.109	Thu Jun 12 14:49:37 2014
+++ src/include/stdlib.h	Wed Jun 18 13:48:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdlib.h,v 1.109 2014/06/12 18:49:37 christos Exp $	*/
+/*	$NetBSD: stdlib.h,v 1.110 2014/06/18 17:48:22 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -182,6 +182,8 @@ void	 srandom(unsigned int) __RENAME(__s
 #endif
 #ifdef _NETBSD_SOURCE
 #define	RANDOM_MAX	0x7fff	/* (((long)1 << 31) - 1) */
+int	 mkostemp(char *, int);
+int	 mkostemps(char *, int, int);
 #endif
 
 char	*mkdtemp(char *);

Index: src/include/unistd.h
diff -u src/include/unistd.h:1.140 src/include/unistd.h:1.141
--- src/include/unistd.h:1.140	Thu Jan  2 18:33:50 2014
+++ src/include/unistd.h	Wed Jun 18 13:48:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: unistd.h,v 1.140 2014/01/02 23:33:50 christos Exp $	*/
+/*	$NetBSD: unistd.h,v 1.141 2014/06/18 17:48:22 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -353,6 +353,7 @@ __aconst char *getusershell(void);
 int	 initgroups(const char *, gid_t);
 int	 iruserok(uint32_t, int, const char *, const char *);
 int  issetugid(void);
+int	 mkstemps(char *, int);
 int	 nfssvc(int, void *);
 int	 pipe2(int *, int);
 int	 profil(char *, size_t, u_long, u_int);

CVS commit: src/lib/libc/stdio

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 17:50:55 UTC 2014

Modified Files:
src/lib/libc/stdio: Makefile.inc

Log Message:
more man pages links


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/lib/libc/stdio/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/stdio/Makefile.inc
diff -u src/lib/libc/stdio/Makefile.inc:1.44 src/lib/libc/stdio/Makefile.inc:1.45
--- src/lib/libc/stdio/Makefile.inc:1.44	Wed Jun 18 13:47:58 2014
+++ src/lib/libc/stdio/Makefile.inc	Wed Jun 18 13:50:55 2014
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.inc	5.7 (Berkeley) 6/27/91
-#	$NetBSD: Makefile.inc,v 1.44 2014/06/18 17:47:58 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.45 2014/06/18 17:50:55 christos Exp $
 
 # stdio sources
 .PATH: ${.CURDIR}/stdio
@@ -48,6 +48,8 @@ MLINKS+=getc.3 fgetc.3 getc.3 getc_unloc
 	getc.3 getchar_unlocked.3 getc.3 getw.3
 MLINKS+=getdelim.3 getline.3
 MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3
+MLINKS+=mktemp.3 mkostemp.3 mktemp.3 mkostemps.3
+MLINKS+=mktemp.3 mkstemps.3
 MLINKS+=printf.3 asprintf.3 printf.3 fprintf.3 printf.3 snprintf.3 \
 	printf.3 sprintf.3 printf.3 vasprintf.3 printf.3 vfprintf.3 \
 	printf.3 vprintf.3 printf.3 vsnprintf.3 printf.3 vsprintf.3 \

CVS commit: src/distrib/sets/lists/comp

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 17:52:49 UTC 2014

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
more mktemp flavors.


To generate a diff of this commit:
cvs rdiff -u -r1.1895 -r1.1896 src/distrib/sets/lists/comp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1895 src/distrib/sets/lists/comp/mi:1.1896
--- src/distrib/sets/lists/comp/mi:1.1895	Mon Jun 16 08:54:42 2014
+++ src/distrib/sets/lists/comp/mi	Wed Jun 18 13:52:49 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1895 2014/06/16 12:54:42 joerg Exp $
+#	$NetBSD: mi,v 1.1896 2014/06/18 17:52:49 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7955,7 +7955,10 @@
 ./usr/share/man/cat3/mi_vector_hash.0		comp-c-catman		.cat
 ./usr/share/man/cat3/minor.0			comp-c-catman		.cat
 ./usr/share/man/cat3/mkdtemp.0			comp-c-catman		.cat
+./usr/share/man/cat3/mkostemp.0			comp-c-catman		.cat
+./usr/share/man/cat3/mkostemps.0		comp-c-catman		.cat
 ./usr/share/man/cat3/mkstemp.0			comp-c-catman		.cat
+./usr/share/man/cat3/mkstemps.0			comp-c-catman		.cat
 ./usr/share/man/cat3/mktemp.0			comp-c-catman		.cat
 ./usr/share/man/cat3/mktime.0			comp-c-catman		.cat
 ./usr/share/man/cat3/mktime_z.0			comp-c-catman		.cat
@@ -14742,7 +14745,10 @@
 ./usr/share/man/html3/mi_vector_hash.html	comp-c-htmlman		html
 ./usr/share/man/html3/minor.html		comp-c-htmlman		html
 ./usr/share/man/html3/mkdtemp.html		comp-c-htmlman		html
+./usr/share/man/html3/mkostemp.html		comp-c-htmlman		html
+./usr/share/man/html3/mkostemps.html		comp-c-htmlman		html
 ./usr/share/man/html3/mkstemp.html		comp-c-htmlman		html
+./usr/share/man/html3/mkstemps.html		comp-c-htmlman		html
 ./usr/share/man/html3/mktemp.html		comp-c-htmlman		html
 ./usr/share/man/html3/mktime.html		comp-c-htmlman		html
 ./usr/share/man/html3/mktime_z.html		comp-c-htmlman		html
@@ -21515,7 +21521,10 @@
 ./usr/share/man/man3/mi_vector_hash.3		comp-c-man		.man
 ./usr/share/man/man3/minor.3			comp-c-man		.man
 ./usr/share/man/man3/mkdtemp.3			comp-c-man		.man
+./usr/share/man/man3/mkostemp.3			comp-c-man		.man
+./usr/share/man/man3/mkostemps.3		comp-c-man		.man
 ./usr/share/man/man3/mkstemp.3			comp-c-man		.man
+./usr/share/man/man3/mkstemps.3			comp-c-man		.man
 ./usr/share/man/man3/mktemp.3			comp-c-man		.man
 ./usr/share/man/man3/mktime.3			comp-c-man		.man
 ./usr/share/man/man3/mktime_z.3			comp-c-man		.man

CVS commit: src/distrib/sets/lists

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 17:50:15 UTC 2014

Modified Files:
src/distrib/sets/lists/base: ad.arm ad.mips ad.powerpc md.amd64
md.sparc64 shl.mi
src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.amd64
md.sparc64 shl.mi

Log Message:
bump libc.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.235 -r1.236 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.222 -r1.223 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.704 -r1.705 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/debug/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.45 src/distrib/sets/lists/base/ad.arm:1.46
--- src/distrib/sets/lists/base/ad.arm:1.45	Fri Jun 13 11:45:05 2014
+++ src/distrib/sets/lists/base/ad.arm	Wed Jun 18 13:50:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.45 2014/06/13 15:45:05 joerg Exp $
+# $NetBSD: ad.arm,v 1.46 2014/06/18 17:50:14 christos Exp $
 ./lib/oabi	base-compat-shlib	compat
 ./lib/oabi/npf	base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -92,7 +92,7 @@
 ./usr/lib/oabi/libc++.so.1			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/oabi/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/oabi/libc.so.12			base-compat-shlib	compat,pic
-./usr/lib/oabi/libc.so.12.191			base-compat-shlib	compat,pic
+./usr/lib/oabi/libc.so.12.192			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libc_vfp.so.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libc_vfp.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos

Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.41 src/distrib/sets/lists/base/ad.mips:1.42
--- src/distrib/sets/lists/base/ad.mips:1.41	Fri Jun 13 11:45:05 2014
+++ src/distrib/sets/lists/base/ad.mips	Wed Jun 18 13:50:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.41 2014/06/13 15:45:05 joerg Exp $
+# $NetBSD: ad.mips,v 1.42 2014/06/18 17:50:14 christos Exp $
 ./lib/64	base-compat-shlib	compat,arch64
 ./lib/64/npf	base-npf-shlib		compat,arch64
 ./lib/64/npf/ext_log.sobase-npf-shlib		compat,pic,arch64
@@ -94,7 +94,7 @@
 ./usr/lib/64/libc++.so.1			base-compat-shlib	compat,pic,libcxx,arch64
 ./usr/lib/64/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx,arch64
 ./usr/lib/64/libc.so.12base-compat-shlib	compat,pic,arch64
-./usr/lib/64/libc.so.12.191			base-compat-shlib	compat,pic,arch64
+./usr/lib/64/libc.so.12.192			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/64/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/64/libcrypt.so.1			base-compat-shlib	compat,pic,arch64
@@ -434,7 +434,7 @@
 ./usr/lib/o32/libc++.so.1			base-compat-shlib	compat,pic,libcxx,arch64
 ./usr/lib/o32/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx,arch64
 ./usr/lib/o32/libc.so.12			base-compat-shlib	compat,pic,arch64
-./usr/lib/o32/libc.so.12.191			base-compat-shlib	compat,pic,arch64
+./usr/lib/o32/libc.so.12.192			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/o32/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/o32/libcrypt.so.1			base-compat-shlib	compat,pic,arch64

Index: src/distrib/sets/lists/base/ad.powerpc
diff -u src/distrib/sets/lists/base/ad.powerpc:1.10 src/distrib/sets/lists/base/ad.powerpc:1.11
--- src/distrib/sets/lists/base/ad.powerpc:1.10	Fri Jun 13 11:45:05 2014
+++ src/distrib/sets/lists/base/ad.powerpc	Wed Jun 18 13:50:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.10 2014/06/13 15:45:05 joerg Exp $
+# $NetBSD: ad.powerpc,v 1.11 2014/06/18 17:50:14 christos Exp $
 ./lib/powerpc	base-npf-shlib		compat,arch64
 ./lib/powerpc/npfbase-npf-shlib		compat,arch64
 ./lib/powerpc/npf/ext_log.so			base-npf-shlib		compat,arch64,pic
@@ -83,7 +83,7 @@
 ./usr/lib/powerpc/libc++.so.1			base-compat-shlib	compat,arch64,pic,libcxx
 ./usr/lib/powerpc/libc++.so.1.0			base-compat-shlib	compat,arch64,pic,libcxx
 ./usr/lib/powerpc/libc.so.12			base-compat-shlib	compat,arch64,pic
-./usr/lib/powerpc/libc.so.12.191		base-compat-shlib	compat,arch64,pic
+./usr/li

CVS commit: src/lib/libedit

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 18:12:28 UTC 2014

Modified Files:
src/lib/libedit: chared.c chared.h el.c eln.c histedit.h vi.c

Log Message:
Don't depend on weak aliases to define the vi "alias" expansion function,
provide an API instead to set it.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/libedit/chared.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libedit/chared.h
cvs rdiff -u -r1.72 -r1.73 src/lib/libedit/el.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libedit/eln.c
cvs rdiff -u -r1.52 -r1.53 src/lib/libedit/histedit.h
cvs rdiff -u -r1.44 -r1.45 src/lib/libedit/vi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.39 src/lib/libedit/chared.c:1.40
--- src/lib/libedit/chared.c:1.39	Fri Jul 12 18:39:50 2013
+++ src/lib/libedit/chared.c	Wed Jun 18 14:12:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: chared.c,v 1.39 2013/07/12 22:39:50 christos Exp $	*/
+/*	$NetBSD: chared.c,v 1.40 2014/06/18 18:12:28 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: chared.c,v 1.39 2013/07/12 22:39:50 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.40 2014/06/18 18:12:28 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -434,6 +434,8 @@ ch_init(EditLine *el)
 	el->el_chared.c_kill.last	= el->el_chared.c_kill.buf;
 	el->el_chared.c_resizefun	= NULL;
 	el->el_chared.c_resizearg	= NULL;
+	el->el_chared.c_aliasfun	= NULL;
+	el->el_chared.c_aliasarg	= NULL;
 
 	el->el_map.current		= el->el_map.key;
 
@@ -757,3 +759,11 @@ ch_resizefun(EditLine *el, el_zfunc_t f,
 	el->el_chared.c_resizearg = a;
 	return 0;
 }
+
+protected int
+ch_aliasfun(EditLine *el, el_afunc_t f, void *a)
+{
+	el->el_chared.c_aliasfun = f;
+	el->el_chared.c_aliasarg = a;
+	return 0;
+}

Index: src/lib/libedit/chared.h
diff -u src/lib/libedit/chared.h:1.21 src/lib/libedit/chared.h:1.22
--- src/lib/libedit/chared.h:1.21	Sat Aug 28 11:44:59 2010
+++ src/lib/libedit/chared.h	Wed Jun 18 14:12:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: chared.h,v 1.21 2010/08/28 15:44:59 christos Exp $	*/
+/*	$NetBSD: chared.h,v 1.22 2014/06/18 18:12:28 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -104,6 +104,7 @@ typedef struct c_kill_t {
 } c_kill_t;
 
 typedef void (*el_zfunc_t)(EditLine *, void *);
+typedef const char *(*el_afunc_t)(void *, const char *);
 
 /*
  * Note that we use both data structures because the user can bind
@@ -116,7 +117,9 @@ typedef struct el_chared_t {
 	c_vcmd_t	c_vcmd;
 	c_macro_t	c_macro;
 	el_zfunc_t	c_resizefun;
+	el_afunc_t	c_aliasfun;
 	void *		c_resizearg;
+	void *		c_aliasarg;
 } el_chared_t;
 
 
@@ -165,6 +168,7 @@ protected int	 c_hpos(EditLine *);
 protected int	 ch_init(EditLine *);
 protected void	 ch_reset(EditLine *, int);
 protected int	 ch_resizefun(EditLine *, el_zfunc_t, void *);
+protected int	 ch_aliasfun(EditLine *, el_afunc_t, void *);
 protected int	 ch_enlargebufs(EditLine *, size_t);
 protected void	 ch_end(EditLine *);
 

Index: src/lib/libedit/el.c
diff -u src/lib/libedit/el.c:1.72 src/lib/libedit/el.c:1.73
--- src/lib/libedit/el.c:1.72	Tue Jan 22 15:23:21 2013
+++ src/lib/libedit/el.c	Wed Jun 18 14:12:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: el.c,v 1.72 2013/01/22 20:23:21 christos Exp $	*/
+/*	$NetBSD: el.c,v 1.73 2014/06/18 18:12:28 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
 #else
-__RCSID("$NetBSD: el.c,v 1.72 2013/01/22 20:23:21 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.73 2014/06/18 18:12:28 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -194,6 +194,13 @@ FUN(el,set)(EditLine *el, int op, ...)
 		break;
 	}
 
+	case EL_ALIAS_TEXT: {
+		el_afunc_t p = va_arg(ap, el_afunc_t);
+		void *arg = va_arg(ap, void *);
+		rv = ch_aliasfun(el, p, arg);
+		break;
+	}
+
 	case EL_PROMPT_ESC:
 	case EL_RPROMPT_ESC: {
 		el_pfunc_t p = va_arg(ap, el_pfunc_t);

Index: src/lib/libedit/eln.c
diff -u src/lib/libedit/eln.c:1.16 src/lib/libedit/eln.c:1.17
--- src/lib/libedit/eln.c:1.16	Tue May 20 11:05:08 2014
+++ src/lib/libedit/eln.c	Wed Jun 18 14:12:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: eln.c,v 1.16 2014/05/20 15:05:08 christos Exp $	*/
+/*	$NetBSD: eln.c,v 1.17 2014/06/18 18:12:28 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.16 2014/05/20 15:05:08 christos Exp $");
+__RCSID("$NetBSD: eln.c,v 1.17 2014/06/18 18:12:28 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include "histedit.h"
@@ -125,6 +125,13 @@ el_set(EditLine *el, int op, ...)
 		break;
 	}
 
+	case EL_ALIAS_TEXT: {
+		el_afunc_t p = va_arg(ap, el_afunc_t);
+		void *arg = va_

CVS commit: src/bin/sh

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 18:17:30 UTC 2014

Modified Files:
src/bin/sh: alias.c alias.h histedit.c

Log Message:
Adjust to the new alias text libedit API.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/bin/sh/alias.c
cvs rdiff -u -r1.7 -r1.8 src/bin/sh/alias.h
cvs rdiff -u -r1.46 -r1.47 src/bin/sh/histedit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/alias.c
diff -u src/bin/sh/alias.c:1.14 src/bin/sh/alias.c:1.15
--- src/bin/sh/alias.c:1.14	Sat Jun 18 17:18:46 2011
+++ src/bin/sh/alias.c	Wed Jun 18 14:17:30 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: alias.c,v 1.14 2011/06/18 21:18:46 christos Exp $	*/
+/*	$NetBSD: alias.c,v 1.15 2014/06/18 18:17:30 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: alias.c,v 1.14 2011/06/18 21:18:46 christos Exp $");
+__RCSID("$NetBSD: alias.c,v 1.15 2014/06/18 18:17:30 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ struct alias *atab[ATABSIZE];
 
 STATIC void setalias(char *, char *);
 STATIC int unalias(char *);
-STATIC struct alias **hashalias(char *);
+STATIC struct alias **hashalias(const char *);
 
 STATIC
 void
@@ -178,7 +178,7 @@ rmaliases(void)
 }
 
 struct alias *
-lookupalias(char *name, int check)
+lookupalias(const char *name, int check)
 {
 	struct alias *ap = *hashalias(name);
 
@@ -193,8 +193,8 @@ lookupalias(char *name, int check)
 	return (NULL);
 }
 
-char *
-get_alias_text(char *name)
+const char *
+alias_text(void *dummy __unused, const char *name)
 {
 	struct alias *ap;
 
@@ -264,7 +264,7 @@ unaliascmd(int argc, char **argv)
 }
 
 STATIC struct alias **
-hashalias(char *p)
+hashalias(const char *p)
 {
 	unsigned int hashval;
 

Index: src/bin/sh/alias.h
diff -u src/bin/sh/alias.h:1.7 src/bin/sh/alias.h:1.8
--- src/bin/sh/alias.h:1.7	Sat Jun 18 17:18:46 2011
+++ src/bin/sh/alias.h	Wed Jun 18 14:17:30 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: alias.h,v 1.7 2011/06/18 21:18:46 christos Exp $	*/
+/*	$NetBSD: alias.h,v 1.8 2014/06/18 18:17:30 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -43,6 +43,6 @@ struct alias {
 	int flag;
 };
 
-struct alias *lookupalias(char *, int);
-char *get_alias_text(char *);
+struct alias *lookupalias(const char *, int);
+const char *alias_text(void *, const char *);
 void rmaliases(void);

Index: src/bin/sh/histedit.c
diff -u src/bin/sh/histedit.c:1.46 src/bin/sh/histedit.c:1.47
--- src/bin/sh/histedit.c:1.46	Sun Mar 23 01:07:59 2014
+++ src/bin/sh/histedit.c	Wed Jun 18 14:17:30 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: histedit.c,v 1.46 2014/03/23 05:07:59 dholland Exp $	*/
+/*	$NetBSD: histedit.c,v 1.47 2014/06/18 18:17:30 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: histedit.c,v 1.46 2014/03/23 05:07:59 dholland Exp $");
+__RCSID("$NetBSD: histedit.c,v 1.47 2014/06/18 18:17:30 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,6 +59,7 @@ __RCSID("$NetBSD: histedit.c,v 1.46 2014
 #include "mystring.h"
 #include "myhistedit.h"
 #include "error.h"
+#include "alias.h"
 #ifndef SMALL
 #include "eval.h"
 #include "memalloc.h"
@@ -135,6 +136,7 @@ histedit(void)
 	el_set(el, EL_HIST, history, hist);
 el_set(el, EL_PROMPT, getprompt);
 el_set(el, EL_SIGNAL, 1);
+el_set(el, EL_ALIAS_TEXT, alias_text, NULL);
 el_set(el, EL_ADDFN, "rl-complete",
 "ReadLine compatible completion function",
 _el_fn_complete);

CVS commit: src/lib/libedit

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 18:52:49 UTC 2014

Modified Files:
src/lib/libedit: tty.c

Log Message:
Add stdlib.h for abort() (Jess Thrysoee)


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libedit/tty.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.45 src/lib/libedit/tty.c:1.46
--- src/lib/libedit/tty.c:1.45	Mon May 19 17:01:48 2014
+++ src/lib/libedit/tty.c	Wed Jun 18 14:52:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty.c,v 1.45 2014/05/19 21:01:48 christos Exp $	*/
+/*	$NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tty.c,v 1.45 2014/05/19 21:01:48 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -48,6 +48,7 @@ __RCSID("$NetBSD: tty.c,v 1.45 2014/05/1
 #include 
 #include 	/* for isatty */
 #include 	/* for ffs */
+#include 	/* for abort */
 #include "el.h"
 #include "tty.h"

CVS commit: src/sys/rump/include/rump

2014-06-18 Thread Alexander Nasonov 
Module Name:src
Committed By:   alnsn
Date:   Wed Jun 18 19:50:32 UTC 2014

Modified Files:
src/sys/rump/include/rump: rumpuser.h

Log Message:
Revert last change. This is not the right place for rumpuser_sync_icache().


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/rump/include/rump/rumpuser.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.112 src/sys/rump/include/rump/rumpuser.h:1.113
--- src/sys/rump/include/rump/rumpuser.h:1.112	Tue Jun 17 06:31:47 2014
+++ src/sys/rump/include/rump/rumpuser.h	Wed Jun 18 19:50:32 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.h,v 1.112 2014/06/17 06:31:47 alnsn Exp $	*/
+/*	$NetBSD: rumpuser.h,v 1.113 2014/06/18 19:50:32 alnsn Exp $	*/
 
 /*
  * Copyright (c) 2007-2013 Antti Kantee.  All Rights Reserved.
@@ -229,11 +229,6 @@ typedef void (*rump_compload_fn)(const s
 void rumpuser_dl_bootstrap(rump_modinit_fn, rump_symload_fn, rump_compload_fn);
 
 /*
- * cache management
- */
-int rumpuser_sync_icache(void *addr, uint64_t len);
-
-/*
  * misc management
  */

CVS commit: src/lib/libedit/TEST

2014-06-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jun 18 20:12:15 UTC 2014

Modified Files:
src/lib/libedit/TEST: tc1.c wtc1.c

Log Message:
cast gotsig because it is long on some systems.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libedit/TEST/tc1.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libedit/TEST/wtc1.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/TEST/tc1.c
diff -u src/lib/libedit/TEST/tc1.c:1.5 src/lib/libedit/TEST/tc1.c:1.6
--- src/lib/libedit/TEST/tc1.c:1.5	Sun Apr 18 17:17:47 2010
+++ src/lib/libedit/TEST/tc1.c	Wed Jun 18 16:12:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: tc1.c,v 1.5 2010/04/18 21:17:47 christos Exp $	*/
+/*	$NetBSD: tc1.c,v 1.6 2014/06/18 20:12:15 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 19
 #if 0
 static char sccsid[] = "@(#)test.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tc1.c,v 1.5 2010/04/18 21:17:47 christos Exp $");
+__RCSID("$NetBSD: tc1.c,v 1.6 2014/06/18 20:12:15 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -189,7 +189,7 @@ main(int argc, char *argv[])
 
 #endif
 		if (gotsig) {
-			(void) fprintf(stderr, "Got signal %d.\n", gotsig);
+			(void) fprintf(stderr, "Got signal %d.\n", (int)gotsig);
 			gotsig = 0;
 			el_reset(el);
 		}

Index: src/lib/libedit/TEST/wtc1.c
diff -u src/lib/libedit/TEST/wtc1.c:1.6 src/lib/libedit/TEST/wtc1.c:1.7
--- src/lib/libedit/TEST/wtc1.c:1.6	Fri Nov 18 15:30:01 2011
+++ src/lib/libedit/TEST/wtc1.c	Wed Jun 18 16:12:15 2014
@@ -170,7 +170,7 @@ main(int argc, char *argv[])
 #endif
 
 		if (gotsig) {
-			(void)fprintf(stderr, "Got signal %d.\n", gotsig);
+			(void)fprintf(stderr, "Got signal %d.\n", (int)gotsig);
 			gotsig = 0;
 			el_reset(el);
 		}

CVS commit: src/lib/libc/stdio

2014-06-18 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Thu Jun 19 05:31:15 UTC 2014

Modified Files:
src/lib/libc/stdio: gettemp.c

Log Message:
Fix "shadows a global declaration" compile error.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/stdio/gettemp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/stdio/gettemp.c
diff -u src/lib/libc/stdio/gettemp.c:1.18 src/lib/libc/stdio/gettemp.c:1.19
--- src/lib/libc/stdio/gettemp.c:1.18	Wed Jun 18 17:47:58 2014
+++ src/lib/libc/stdio/gettemp.c	Thu Jun 19 05:31:15 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: gettemp.c,v 1.18 2014/06/18 17:47:58 christos Exp $	*/
+/*	$NetBSD: gettemp.c,v 1.19 2014/06/19 05:31:15 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: gettemp.c,v 1.18 2014/06/18 17:47:58 christos Exp $");
+__RCSID("$NetBSD: gettemp.c,v 1.19 2014/06/19 05:31:15 msaitoh Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -56,7 +56,7 @@ GETTEMP(char *path, int *doopen, int dom
 	char *pad;
 	struct stat sbuf;
 	int rval;
-	uint32_t rand;
+	uint32_t r;
 	char carrybuf[MAXPATHLEN];
 
 	_DIAGASSERT(path != NULL);
@@ -85,8 +85,8 @@ GETTEMP(char *path, int *doopen, int dom
 
 	/* Fill space with random characters */
 	while (trv >= path && *trv == 'X') {
-		rand = arc4random_uniform(sizeof(padchar) - 1);
-		*trv-- = padchar[rand];
+		r = arc4random_uniform(sizeof(padchar) - 1);
+		*trv-- = padchar[r];
 	}
 	start = trv + 1;