From owner-svn-src-head@FreeBSD.ORG  Mon Apr 27 08:34:48 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 529CF9B2;
 Mon, 27 Apr 2015 08:34:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4152D12B4;
 Mon, 27 Apr 2015 08:34:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R8YmdP009365;
 Mon, 27 Apr 2015 08:34:48 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R8Yle7009360;
 Mon, 27 Apr 2015 08:34:47 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201504270834.t3R8Yle7009360@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 27 Apr 2015 08:34:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282072 - head/tools/regression/p1003_1b
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Apr 2015 08:34:48 -0000

Author: ngie
Date: Mon Apr 27 08:34:46 2015
New Revision: 282072
URL: https://svnweb.freebsd.org/changeset/base/282072

Log:
  - Fix compilation (MAP_INHERIT's dead)
  - Fix warnings
  - Use mkstemp instead of tmpnam
  
  MFC after: 1 week

Modified:
  head/tools/regression/p1003_1b/Makefile
  head/tools/regression/p1003_1b/fifo.c
  head/tools/regression/p1003_1b/sched.c
  head/tools/regression/p1003_1b/yield.c
Directory Properties:
  head/   (props changed)

Modified: head/tools/regression/p1003_1b/Makefile
==============================================================================
--- head/tools/regression/p1003_1b/Makefile	Mon Apr 27 08:31:43 2015	(r282071)
+++ head/tools/regression/p1003_1b/Makefile	Mon Apr 27 08:34:46 2015	(r282072)
@@ -14,4 +14,5 @@ SRCS=\
 MAN=
 
 CFLAGS+=-DNO_MEMLOCK
+
 .include <bsd.prog.mk>

Modified: head/tools/regression/p1003_1b/fifo.c
==============================================================================
--- head/tools/regression/p1003_1b/fifo.c	Mon Apr 27 08:31:43 2015	(r282071)
+++ head/tools/regression/p1003_1b/fifo.c	Mon Apr 27 08:34:46 2015	(r282072)
@@ -31,17 +31,17 @@
  *
  * $FreeBSD$
  */
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <err.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/time.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <sched.h>
 #include <signal.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
 
 volatile int ticked;
 #define CAN_USE_ALARMS
@@ -109,7 +109,7 @@ int fifo(int argc, char *argv[])
 	fifo_param.sched_priority = 1;
 
 	p = (long *)mmap(0, sizeof(*p),
-	PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED|MAP_INHERIT, -1, 0);
+	PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0);
 
 	if (p == (long *)-1)
 		err(errno, "mmap");

Modified: head/tools/regression/p1003_1b/sched.c
==============================================================================
--- head/tools/regression/p1003_1b/sched.c	Mon Apr 27 08:31:43 2015	(r282071)
+++ head/tools/regression/p1003_1b/sched.c	Mon Apr 27 08:34:46 2015	(r282072)
@@ -41,16 +41,17 @@
 #define _POSIX_SOURCE
 #define _POSIX_C_SOURCE 199309L
 
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <stdio.h>
-#include <string.h>
+#include <sys/mman.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/mman.h>
-
+#include <limits.h>
 #include <sched.h>
+#include <stdio.h>
+#define	__XSI_VISIBLE 1
+#include <stdlib.h>
+#undef __XSI_VISIBLE
+#include <string.h>
+#include <unistd.h>
 
 #include "prutil.h"
 
@@ -209,17 +210,14 @@ int sched(int ac, char *av[])
 
 
 	{
-#define NAM "P1003_1b_schedXXXX"
-		char nam[L_tmpnam];
+		char nam[] = "P1003_1b_schedXXXXXX";
 		int fd;
 		pid_t p;
 		pid_t *lastrun;
 
-		strcpy(nam, NAM);
-		if (tmpnam(nam) != nam)
-			q(__LINE__, errno, "tmpnam " NAM);
-		q(__LINE__, (fd = open(nam, O_RDWR|O_CREAT, 0666)),
-			"open " NAM);
+		fd = mkstemp(nam);
+		if (fd == -1)
+			q(__LINE__, errno, "mkstemp failed");
 
 		(void)unlink(nam);
 

Modified: head/tools/regression/p1003_1b/yield.c
==============================================================================
--- head/tools/regression/p1003_1b/yield.c	Mon Apr 27 08:31:43 2015	(r282071)
+++ head/tools/regression/p1003_1b/yield.c	Mon Apr 27 08:34:46 2015	(r282072)
@@ -89,7 +89,7 @@ int yield(int argc, char *argv[])
 		n = nslaves = atoi(argv[1]);
 
 	p = (int *)mmap(0, sizeof(int),
-	PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED|MAP_INHERIT, -1, 0);
+	PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0);
 
 	if (p == (int *)-1)
 		err(errno, "mmap");