From 63aaf4d411d5f7510f19ba7fdfcf80c1ef5379ea Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 25 Oct 2015 22:33:04 +0000
Subject: [PATCH] MFstable/10 r289954:

MFC r282072,r283018:

r282072:

- Fix compilation (MAP_INHERIT's dead)
- Fix warnings
- Use mkstemp instead of tmpnam

r283018:

Fix more warnings related to missing headers


git-svn-id: svn://svn.freebsd.org/base/stable/9@289955 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 tools/regression/p1003_1b/Makefile |  1 +
 tools/regression/p1003_1b/fifo.c   | 14 +++++++-------
 tools/regression/p1003_1b/main.c   |  1 +
 tools/regression/p1003_1b/prutil.c |  9 +++++----
 tools/regression/p1003_1b/sched.c  | 26 ++++++++++++--------------
 tools/regression/p1003_1b/yield.c  |  2 +-
 6 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile
index 85db354b9..8b5dd70c4 100644
--- a/tools/regression/p1003_1b/Makefile
+++ b/tools/regression/p1003_1b/Makefile
@@ -14,4 +14,5 @@ SRCS=\
 NO_MAN=
 
 CFLAGS+=-DNO_MEMLOCK
+
 .include <bsd.prog.mk>
diff --git a/tools/regression/p1003_1b/fifo.c b/tools/regression/p1003_1b/fifo.c
index 455f7f9ad..925e7c213 100644
--- a/tools/regression/p1003_1b/fifo.c
+++ b/tools/regression/p1003_1b/fifo.c
@@ -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");
diff --git a/tools/regression/p1003_1b/main.c b/tools/regression/p1003_1b/main.c
index 0e87c6ca6..23c3b0247 100644
--- a/tools/regression/p1003_1b/main.c
+++ b/tools/regression/p1003_1b/main.c
@@ -1,5 +1,6 @@
 /* $FreeBSD$ */
 #include <stdio.h>
+#include <string.h>
 
 int fifo(int argc, char *argv[]);
 int memlock(int argc, char *argv[]);
diff --git a/tools/regression/p1003_1b/prutil.c b/tools/regression/p1003_1b/prutil.c
index e0e3d6f8f..2910b7fdd 100644
--- a/tools/regression/p1003_1b/prutil.c
+++ b/tools/regression/p1003_1b/prutil.c
@@ -1,10 +1,11 @@
+#include <err.h>
 #include <errno.h>
-#include <unistd.h>
 #include <sched.h>
 #include <stdio.h>
-
-#include <err.h>
+#include <stdlib.h>
 #include <sysexits.h>
+#include <unistd.h>
+
 #include "prutil.h"
 
 /*
@@ -12,7 +13,7 @@
  */
 void quit(const char *text)
 {
-	err(errno, text);
+	err(errno, "%s", text);
 }
 
 char *sched_text(int scheduler)
diff --git a/tools/regression/p1003_1b/sched.c b/tools/regression/p1003_1b/sched.c
index bd978f8d4..1814c7919 100644
--- a/tools/regression/p1003_1b/sched.c
+++ b/tools/regression/p1003_1b/sched.c
@@ -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);
 
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index ac31a99f2..a9b7badb3 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -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");
-- 
2.45.0