d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix compilation (MAP_INHERIT's dead)

Browse Source 
- Fix warnings
- Use mkstemp instead of tmpnam

MFC after: 1 week
This commit is contained in:
Enji Cooper 2015-04-27 08:34:46 +00:00
parent e100f6a2fc
commit a39b8b86f7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=282072
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/regression/p1003_1b/Makefile
View File

@ -14,4 +14,5 @@ SRCS=\
MAN=
CFLAGS+=-DNO_MEMLOCK
.include <bsd.prog.mk>

14
tools/regression/p1003_1b/fifo.c
View File

@ -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");

26
tools/regression/p1003_1b/sched.c
View File

@ -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);

2
tools/regression/p1003_1b/yield.c
View File

@ -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");