Author: ngie
Date: Sun Oct 25 22:33:04 2015
New Revision: 289955
URL: https://svnweb.freebsd.org/changeset/base/289955
Log:
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
Modified:
stable/9/tools/regression/p1003_1b/Makefile
stable/9/tools/regression/p1003_1b/fifo.c
stable/9/tools/regression/p1003_1b/main.c
stable/9/tools/regression/p1003_1b/prutil.c
stable/9/tools/regression/p1003_1b/sched.c
stable/9/tools/regression/p1003_1b/yield.c
Directory Properties:
stable/9/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/regression/ (props changed)
Modified: stable/9/tools/regression/p1003_1b/Makefile
==============================================================================
--- stable/9/tools/regression/p1003_1b/Makefile Sun Oct 25 22:30:45 2015
(r289954)
+++ stable/9/tools/regression/p1003_1b/Makefile Sun Oct 25 22:33:04 2015
(r289955)
@@ -14,4 +14,5 @@ SRCS=\
NO_MAN=
CFLAGS+=-DNO_MEMLOCK
+
.include <bsd.prog.mk>
Modified: stable/9/tools/regression/p1003_1b/fifo.c
==============================================================================
--- stable/9/tools/regression/p1003_1b/fifo.c Sun Oct 25 22:30:45 2015
(r289954)
+++ stable/9/tools/regression/p1003_1b/fifo.c Sun Oct 25 22:33:04 2015
(r289955)
@@ -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: stable/9/tools/regression/p1003_1b/main.c
==============================================================================
--- stable/9/tools/regression/p1003_1b/main.c Sun Oct 25 22:30:45 2015
(r289954)
+++ stable/9/tools/regression/p1003_1b/main.c Sun Oct 25 22:33:04 2015
(r289955)
@@ -1,5 +1,6 @@
/* $FreeBSD$ */
#include <stdio.h>
+#include <string.h>
int fifo(int argc, char *argv[]);
int memlock(int argc, char *argv[]);
Modified: stable/9/tools/regression/p1003_1b/prutil.c
==============================================================================
--- stable/9/tools/regression/p1003_1b/prutil.c Sun Oct 25 22:30:45 2015
(r289954)
+++ stable/9/tools/regression/p1003_1b/prutil.c Sun Oct 25 22:33:04 2015
(r289955)
@@ -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)
Modified: stable/9/tools/regression/p1003_1b/sched.c
==============================================================================
--- stable/9/tools/regression/p1003_1b/sched.c Sun Oct 25 22:30:45 2015
(r289954)
+++ stable/9/tools/regression/p1003_1b/sched.c Sun Oct 25 22:33:04 2015
(r289955)
@@ -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: stable/9/tools/regression/p1003_1b/yield.c
==============================================================================
--- stable/9/tools/regression/p1003_1b/yield.c Sun Oct 25 22:30:45 2015
(r289954)
+++ stable/9/tools/regression/p1003_1b/yield.c Sun Oct 25 22:33:04 2015
(r289955)
@@ -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");
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
