merge branch "netbsd-cvs" to "master"

rumpkernel-attic · May 26, 2014 · bb74ba4 · bb74ba4
2 parents 6e68775 + 48719fc
commit bb74ba4
Show file tree

Hide file tree

Showing 120 changed files with 818 additions and 402 deletions.
diff --git a/bin/ls/print.c b/bin/ls/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.54 2014/02/22 13:11:42 mlelstv Exp $	*/
+/*	$NetBSD: print.c,v 1.55 2014/05/10 09:39:18 martin Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.5 (Berkeley) 7/28/94";
 #else
-__RCSID("$NetBSD: print.c,v 1.54 2014/02/22 13:11:42 mlelstv Exp $");
+__RCSID("$NetBSD: print.c,v 1.55 2014/05/10 09:39:18 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -46,6 +46,7 @@ __RCSID("$NetBSD: print.c,v 1.54 2014/02/22 13:11:42 mlelstv Exp $");
 
 #include <err.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <fts.h>
 #include <grp.h>
 #include <pwd.h>
@@ -136,8 +137,7 @@ printlong(DISPLAY *dp)
 			continue;
 		sp = p->fts_statp;
 		if (f_inode)
-			(void)printf("%*lu ", dp->s_inode,
-			    (unsigned long)sp->st_ino);
+			(void)printf("%*"PRIu64" ", dp->s_inode, sp->st_ino);
 		if (f_size) {
 			if (f_humanize) {
 				if ((humanize_number(szbuf, sizeof(szbuf),
@@ -365,7 +365,7 @@ printaname(FTSENT *p, int inodefield, int sizefield)
 	sp = p->fts_statp;
 	chcnt = 0;
 	if (f_inode)
-		chcnt += printf("%*lu ", inodefield, (unsigned long)sp->st_ino);
+		chcnt += printf("%*"PRIu64" ", inodefield, sp->st_ino);
 	if (f_size) {
 		if (f_humanize) {
 			if ((humanize_number(szbuf, sizeof(szbuf), sp->st_size,

diff --git a/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c b/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c
@@ -658,6 +658,10 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
 		if (i <= 0)
 			return(i);
 		/* if it went, fall through and send more stuff */
+		/* we may have released our buffer, so get it again */
+		if (wb->buf == NULL)
+			if (!ssl3_setup_write_buffer(s))
+				return -1;
 		}
 
 	if (len == 0 && !create_empty_fragment)

diff --git a/external/bsd/tcpdump/dist/tcpdump.c b/external/bsd/tcpdump/dist/tcpdump.c
@@ -34,7 +34,7 @@ The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.283 2008-09-25 21:45:50 guy Exp  (LBL)";
 #else
-__RCSID("$NetBSD: tcpdump.c,v 1.7 2013/12/31 17:33:31 christos Exp $");
+__RCSID("$NetBSD: tcpdump.c,v 1.8 2014/05/13 20:29:59 christos Exp $");
 #endif
 #endif
 
@@ -1482,8 +1482,12 @@ main(int argc, char **argv)
 #endif /* HAVE_CAP_NG_H */
 
 	if (getuid() == 0 || geteuid() == 0) {
-		if (username || chroot_dir)
+		if (username || chroot_dir) {
+#ifndef HAVE_CAP_NG_H
+			if (!WFileName)
+#endif
 			droproot(username, chroot_dir);
+		}
 
 	}
 #endif /* WIN32 */

diff --git a/lib/libc/arch/i386/SYS.h b/lib/libc/arch/i386/SYS.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: SYS.h,v 1.24 2013/09/12 15:36:15 joerg Exp $	*/
+/*	$NetBSD: SYS.h,v 1.25 2014/05/23 02:17:43 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -126,13 +126,15 @@
 
 #define PSEUDO_NOERROR(x,y)						\
 	_SYSCALL_NOERROR(x,y);						\
-	ret
+	ret;								\
+	END(x)
 
 #define PSEUDO(x,y)							\
 	_SYSCALL_NOERROR(x,y);						\
 	jc 2f;								\
 	ret;								\
-	2: _SYSCALL_ERR
+	2: _SYSCALL_ERR;						\
+	END(x)
 
 #define RSYSCALL_NOERROR(x)						\
 	PSEUDO_NOERROR(x,x)

diff --git a/lib/libc/arch/i386/gen/_setjmp.S b/lib/libc/arch/i386/gen/_setjmp.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: _setjmp.S,v 1.8 2005/10/05 20:18:12 christos Exp $	*/
+/*	$NetBSD: _setjmp.S,v 1.9 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: _setjmp.S,v 1.8 2005/10/05 20:18:12 christos Exp $")
+	RCSID("$NetBSD: _setjmp.S,v 1.9 2014/05/23 02:34:19 uebayasi Exp $")
 #endif
 
 /*
@@ -60,6 +60,7 @@ ENTRY(_setjmp)
 	movl	%edi,20(%eax)
 	xorl	%eax,%eax
 	ret
+END(_setjmp)
 
 ENTRY(_longjmp)
 	movl	4(%esp),%edx
@@ -75,3 +76,4 @@ ENTRY(_longjmp)
 	incl	%eax
 1:	movl	%ecx,0(%esp)
 	ret
+END(_longjmp)
diff --git a/lib/libc/arch/i386/gen/alloca.S b/lib/libc/arch/i386/gen/alloca.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: alloca.S,v 1.8 2003/08/07 16:42:06 agc Exp $	*/
+/*	$NetBSD: alloca.S,v 1.9 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: alloca.S,v 1.8 2003/08/07 16:42:06 agc Exp $")
+	RCSID("$NetBSD: alloca.S,v 1.9 2014/05/23 02:34:19 uebayasi Exp $")
 #endif
 
 /* like alloc, but automatic free in return */
@@ -54,3 +54,4 @@ ENTRY(alloca)
 	pushl	0(%ecx)
 	pushl	%eax		/* dummy to pop at callsite */
 	jmp	*%edx		/* "return" */
+END(alloca)
diff --git a/lib/libc/arch/i386/gen/divsi3.S b/lib/libc/arch/i386/gen/divsi3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: divsi3.S,v 1.6 2003/08/07 16:42:07 agc Exp $	*/
+/*	$NetBSD: divsi3.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,11 +36,12 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: divsi3.S,v 1.6 2003/08/07 16:42:07 agc Exp $")
+	RCSID("$NetBSD: divsi3.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $")
 #endif
 
 ENTRY(__divsi3)
 	movl 4(%esp),%eax
 	cltd
 	idivl 8(%esp)
 	ret
+END(__divsi3)
diff --git a/lib/libc/arch/i386/gen/fabs.S b/lib/libc/arch/i386/gen/fabs.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fabs.S,v 1.5 2003/08/07 16:42:07 agc Exp $	*/
+/*	$NetBSD: fabs.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,10 +36,11 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: fabs.S,v 1.5 2003/08/07 16:42:07 agc Exp $")
+	RCSID("$NetBSD: fabs.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $")
 #endif
 
 ENTRY(fabs)
 	fldl	4(%esp)
 	fabs
 	ret
+END(fabs)
diff --git a/lib/libc/arch/i386/gen/fixdfsi.S b/lib/libc/arch/i386/gen/fixdfsi.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fixdfsi.S,v 1.6 2003/08/07 16:42:07 agc Exp $	*/
+/*	$NetBSD: fixdfsi.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -36,11 +36,12 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: fixdfsi.S,v 1.6 2003/08/07 16:42:07 agc Exp $")
+	RCSID("$NetBSD: fixdfsi.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $")
 #endif
 
 ENTRY(__fixdfsi)
 	fldl	4(%esp)
 	fistpl	4(%esp)
 	movl	4(%esp),%eax
 	ret
+END(__fixdfsi)
diff --git a/lib/libc/arch/i386/gen/fixunsdfsi.S b/lib/libc/arch/i386/gen/fixunsdfsi.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fixunsdfsi.S,v 1.13 2013/09/12 15:36:15 joerg Exp $	*/
+/*	$NetBSD: fixunsdfsi.S,v 1.14 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: fixunsdfsi.S,v 1.13 2013/09/12 15:36:15 joerg Exp $")
+	RCSID("$NetBSD: fixunsdfsi.S,v 1.14 2014/05/23 02:34:19 uebayasi Exp $")
 #endif
 
 ENTRY(__fixunsdfsi)
@@ -71,5 +71,6 @@ ENTRY(__fixunsdfsi)
 	movl	4(%esp),%eax
 	orl	$0x80000000,%eax	/* restore bias */
 	ret
+END(__fixunsdfsi)
 
 fbiggestsigned:	.double	2147483648.0
diff --git a/lib/libc/arch/i386/gen/flt_rounds.S b/lib/libc/arch/i386/gen/flt_rounds.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: flt_rounds.S,v 1.9 2011/09/30 23:42:00 christos Exp $	*/
+/*	$NetBSD: flt_rounds.S,v 1.10 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 #include <machine/asm.h>
 
@@ -19,3 +19,4 @@ ENTRY(__flt_rounds)
 	sarl	%cl, %eax	/* 0,1,2,3 -> 1,3,2,0 */
 	andl	$3, %eax
 	ret
+END(__flt_rounds)
diff --git a/lib/libc/arch/i386/gen/fpgetmask.S b/lib/libc/arch/i386/gen/fpgetmask.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpgetmask.S,v 1.4 2002/01/13 21:45:42 thorpej Exp $	*/
+/*	$NetBSD: fpgetmask.S,v 1.5 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 4, 1995
@@ -20,3 +20,8 @@ ENTRY(fpgetmask)
 	andl $63,%eax
 	addl $4,%esp
 	ret
+#ifdef WEAK_ALIAS
+END(_fpgetmask)
+#else
+END(fpgetmask)
+#endif
diff --git a/lib/libc/arch/i386/gen/fpgetprec.S b/lib/libc/arch/i386/gen/fpgetprec.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpgetprec.S,v 1.1 2011/03/26 19:51:41 christos Exp $	*/
+/*	$NetBSD: fpgetprec.S,v 1.2 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 4, 1995
@@ -20,3 +20,8 @@ ENTRY(fpgetprec)
 	andl $3,%eax
 	addl $4,%esp
 	ret
+#ifdef WEAK_ALIAS
+END(_fpgetprec)
+#else
+END(fpgetprec)
+#endif
diff --git a/lib/libc/arch/i386/gen/fpgetround.S b/lib/libc/arch/i386/gen/fpgetround.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpgetround.S,v 1.6 2011/09/30 23:42:00 christos Exp $	*/
+/*	$NetBSD: fpgetround.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 4, 1995
@@ -21,3 +21,8 @@ ENTRY(fpgetround)
 	movl -4(%esp), %eax
 	andl $0x00000c00, %eax
 	ret
+#ifdef WEAK_ALIAS
+END(_fpgetround)
+#else
+END(fpgetround)
+#endif
diff --git a/lib/libc/arch/i386/gen/fpgetsticky.S b/lib/libc/arch/i386/gen/fpgetsticky.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpgetsticky.S,v 1.6 2002/01/13 21:45:43 thorpej Exp $	*/
+/*	$NetBSD: fpgetsticky.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 4, 1995
@@ -19,3 +19,8 @@ ENTRY(fpgetsticky)
 	andl $63,%eax
 	addl $4,%esp
 	ret
+#ifdef WEAK_ALIAS
+END(_fpgetsticky)
+#else
+END(fpgetsticky)
+#endif
diff --git a/lib/libc/arch/i386/gen/fpsetmask.S b/lib/libc/arch/i386/gen/fpsetmask.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetmask.S,v 1.4 2002/01/13 21:45:43 thorpej Exp $	*/
+/*	$NetBSD: fpsetmask.S,v 1.5 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*
  * Written by Charles M. Hannum, Apr 9, 1995
@@ -31,3 +31,8 @@ ENTRY(fpsetmask)
 
 	addl $4,%esp
 	ret
+#ifdef WEAK_ALIAS
+END(_fpsetmask)
+#else
+END(fpsetmask)
+#endif
diff --git a/lib/libc/arch/i386/gen/fpsetprec.S b/lib/libc/arch/i386/gen/fpsetprec.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetprec.S,v 1.1 2011/03/26 19:51:41 christos Exp $	*/
+/*	$NetBSD: fpsetprec.S,v 1.2 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*
  * Written by Charles M. Hannum, Apr 9, 1995
@@ -32,3 +32,8 @@ ENTRY(fpsetprec)
 
 	addl $4,%esp
 	ret
+#ifdef WEAK_ALIAS
+END(_fpsetprec)
+#else
+END(fpsetprec)
+#endif
diff --git a/lib/libc/arch/i386/gen/fpsetround.S b/lib/libc/arch/i386/gen/fpsetround.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetround.S,v 1.5 2011/09/30 23:45:41 christos Exp $	*/
+/*	$NetBSD: fpsetround.S,v 1.6 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*
  * Written by Frank van der Linden at Wasabi Systems for NetBSD.
@@ -31,3 +31,8 @@ ENTRY(fpsetround)
 	fldcw	-4(%esp)
 
 	ret
+#ifdef WEAK_ALIAS
+END(_fpsetround)
+#else
+END(fpsetround)
+#endif
diff --git a/lib/libc/arch/i386/gen/fpsetsticky.S b/lib/libc/arch/i386/gen/fpsetsticky.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetsticky.S,v 1.6 2002/01/13 21:45:43 thorpej Exp $	*/
+/*	$NetBSD: fpsetsticky.S,v 1.7 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*
  * Written by Charles M. Hannum, Apr 9, 1995
@@ -30,3 +30,8 @@ ENTRY(fpsetsticky)
 
 	addl $28,%esp
 	ret
+#ifdef WEAK_ALIAS
+END(_fpsetsticky)
+#else
+END(fpsetsticky)
+#endif
diff --git a/lib/libc/arch/i386/gen/resumecontext.S b/lib/libc/arch/i386/gen/resumecontext.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: resumecontext.S,v 1.7 2013/09/12 15:36:15 joerg Exp $	*/
+/*	$NetBSD: resumecontext.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #include "SYS.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: resumecontext.S,v 1.7 2013/09/12 15:36:15 joerg Exp $")
+	RCSID("$NetBSD: resumecontext.S,v 1.8 2014/05/23 02:34:19 uebayasi Exp $")
 #endif /* LIBC_SCCS && !lint */
 
 /*
@@ -81,3 +81,4 @@ NENTRY(_resumecontext)	/* profiling prologue would clobber TOS */
 	pushl	$-1
 	pushl	%eax	/* unused return address */
 	SYSTRAP(exit)
+END(_resumecontext)