Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)
- Fix for possible unset uid/gid in toproto
- Fix for default mtree style
- Update libelf
- Importing libexecinfo
- Resynchronize GCC, mpc, gmp, mpfr
- build.sh: Replace params with show-params.
This has been done as the make target has been renamed in the same
way, while a new target named params has been added. This new
target generates a file containing all the parameters, instead of
printing it on the console.
- Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
get getservbyport() out of the inner loop
Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* $NetBSD: t_lockf.c,v 1.8 2013/02/20 02:22:48 pgoyette Exp $ */
|
||||
/* $NetBSD: t_lockf.c,v 1.9 2013/10/19 17:45:00 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
@@ -70,7 +70,7 @@ random_uint32(void)
|
||||
static void
|
||||
trylocks(int id)
|
||||
{
|
||||
int i, ret, fd;
|
||||
int i, fd;
|
||||
|
||||
srand48(getpid());
|
||||
|
||||
@@ -99,7 +99,7 @@ trylocks(int id)
|
||||
}
|
||||
fl.l_whence = SEEK_SET;
|
||||
|
||||
ret = fcntl(fd, F_SETLKW, &fl);
|
||||
(void)fcntl(fd, F_SETLKW, &fl);
|
||||
|
||||
if (usleep(sleeptime) < 0)
|
||||
err(1, "usleep");
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* $NetBSD: t_sysv.c,v 1.2 2012/11/06 18:31:53 pgoyette Exp $ */
|
||||
/* $NetBSD: t_sysv.c,v 1.3 2013/07/24 11:44:10 skrll Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
|
||||
@@ -252,11 +252,11 @@ ATF_TC_BODY(msg, tc)
|
||||
*/
|
||||
m.mtype = MTYPE_1;
|
||||
strcpy(m.mtext, m1_str);
|
||||
ATF_REQUIRE_MSG(msgsnd(sender_msqid, &m, sizeof(m), 0) != -1,
|
||||
"sender: msgsnd 1: %d", errno);
|
||||
ATF_REQUIRE_MSG(msgsnd(sender_msqid, &m, MESSAGE_TEXT_LEN,
|
||||
0) != -1, "sender: msgsnd 1: %d", errno);
|
||||
|
||||
ATF_REQUIRE_MSG(msgrcv(sender_msqid, &m, sizeof(m),
|
||||
MTYPE_1_ACK, 0) == sizeof(m),
|
||||
ATF_REQUIRE_MSG(msgrcv(sender_msqid, &m, MESSAGE_TEXT_LEN,
|
||||
MTYPE_1_ACK, 0) == MESSAGE_TEXT_LEN,
|
||||
"sender: msgrcv 1 ack: %d", errno);
|
||||
|
||||
print_msqid_ds(&m_ds, 0600);
|
||||
@@ -266,11 +266,11 @@ ATF_TC_BODY(msg, tc)
|
||||
*/
|
||||
m.mtype = MTYPE_2;
|
||||
strcpy(m.mtext, m2_str);
|
||||
ATF_REQUIRE_MSG(msgsnd(sender_msqid, &m, sizeof(m), 0) != -1,
|
||||
ATF_REQUIRE_MSG(msgsnd(sender_msqid, &m, MESSAGE_TEXT_LEN, 0) != -1,
|
||||
"sender: msgsnd 2: %d", errno);
|
||||
|
||||
ATF_REQUIRE_MSG(msgrcv(sender_msqid, &m, sizeof(m),
|
||||
MTYPE_2_ACK, 0) == sizeof(m),
|
||||
ATF_REQUIRE_MSG(msgrcv(sender_msqid, &m, MESSAGE_TEXT_LEN,
|
||||
MTYPE_2_ACK, 0) == MESSAGE_TEXT_LEN,
|
||||
"sender: msgrcv 2 ack: %d", errno);
|
||||
}
|
||||
|
||||
@@ -361,7 +361,7 @@ receiver()
|
||||
/*
|
||||
* Receive the first message, print it, and send an ACK.
|
||||
*/
|
||||
if (msgrcv(msqid, &m, sizeof(m), MTYPE_1, 0) != sizeof(m))
|
||||
if (msgrcv(msqid, &m, MESSAGE_TEXT_LEN, MTYPE_1, 0) != MESSAGE_TEXT_LEN)
|
||||
err(1, "receiver: msgrcv 1");
|
||||
|
||||
printf("%s\n", m.mtext);
|
||||
@@ -370,14 +370,14 @@ receiver()
|
||||
|
||||
m.mtype = MTYPE_1_ACK;
|
||||
|
||||
if (msgsnd(msqid, &m, sizeof(m), 0) == -1)
|
||||
if (msgsnd(msqid, &m, MESSAGE_TEXT_LEN, 0) == -1)
|
||||
err(1, "receiver: msgsnd ack 1");
|
||||
|
||||
/*
|
||||
* Receive the second message, print it, and send an ACK.
|
||||
*/
|
||||
|
||||
if (msgrcv(msqid, &m, sizeof(m), MTYPE_2, 0) != sizeof(m))
|
||||
if (msgrcv(msqid, &m, MESSAGE_TEXT_LEN, MTYPE_2, 0) != MESSAGE_TEXT_LEN)
|
||||
err(1, "receiver: msgrcv 2");
|
||||
|
||||
printf("%s\n", m.mtext);
|
||||
@@ -386,7 +386,7 @@ receiver()
|
||||
|
||||
m.mtype = MTYPE_2_ACK;
|
||||
|
||||
if (msgsnd(msqid, &m, sizeof(m), 0) == -1)
|
||||
if (msgsnd(msqid, &m, MESSAGE_TEXT_LEN, 0) == -1)
|
||||
err(1, "receiver: msgsnd ack 2");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user