Add ENOMSG and EIDRM; from jsg@

5 files changed, 27 insertions, 46 deletions

diff --git a/lib/libc/gen/errlist.c b/lib/libc/gen/errlist.c
index 909b831960b..43b86d96c96 100644
--- a/lib/libc/gen/errlist.c
+++ b/lib/libc/gen/errlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: errlist.c,v 1.11 2007/05/21 17:01:49 jasper Exp $ */
+/*	$OpenBSD: errlist.c,v 1.12 2007/09/03 14:37:52 millert Exp $ */
 /*
  * Copyright (c) 1982, 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -142,5 +142,7 @@ const char *const
 						/* 87 - EOVERFLOW */
 	"Value too large to be stored in data type",
 	"Operation canceled",			/* 88 - ECANCELED */
+	"Identifier removed",			/* 89 - EIDRM */
+	"No message of desired type",		/* 90 - ENOMSG */
 };
 int _sys_nerr = { sizeof _sys_errlist/sizeof _sys_errlist[0] };
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 4e4a86b0dd6..2ce1a573536 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.2,v 1.40 2007/05/31 19:19:32 jmc Exp $
+.\"	$OpenBSD: intro.2,v 1.41 2007/09/03 14:37:52 millert Exp $
 .\"	$NetBSD: intro.2,v 1.6 1995/02/27 12:33:41 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1983, 1986, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)intro.2	8.3 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 3 2007 $
 .Dt INTRO 2
 .Os
 .Sh NAME
@@ -426,6 +426,11 @@ A numerical result of the function was too large to be stored in the
 caller provided space.
 .It Er 88 ECANCELED Em "Operation canceled" .
 The requested operation was canceled.
+.It Er 89 EIDRM Em "Identifier removed" .
+An IPC identifier was removed while the current process was waiting on it.
+.It Er 90 ENOMSG Em "No message of the desired type".
+An IPC message queue does not contain a message of the desired type,
+or a message catalog does not contain the requested message.
 .El
 .Sh DEFINITIONS
 .Bl -tag -width Ds
diff --git a/lib/libc/sys/msgrcv.2 b/lib/libc/sys/msgrcv.2
index 25ff6352525..fc7d574f51b 100644
--- a/lib/libc/sys/msgrcv.2
+++ b/lib/libc/sys/msgrcv.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msgrcv.2,v 1.13 2007/05/31 19:19:33 jmc Exp $
+.\"	$OpenBSD: msgrcv.2,v 1.14 2007/09/03 14:37:52 millert Exp $
 .\"	$NetBSD: msgrcv.2,v 1.2 1997/03/27 08:20:37 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -30,7 +30,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"/
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 3 2007 $
 .Dt MSGRCV 2
 .Os
 .Sh NAME
@@ -166,10 +166,6 @@ will fail if:
 .Fa msqid
 is not a valid message queue identifier.
 .Pp
-The message queue was removed while
-.Fn msgrcv
-was waiting for a message of the requested type to become available on it.
-.Pp
 .Fa msgsz
 is less than 0.
 .It Bq Er E2BIG
@@ -186,12 +182,16 @@ The calling process does not have read access to the message queue.
 points to an invalid address.
 .It Bq Er EINTR
 The system call was interrupted by the delivery of a signal.
-.It Bq Er EAGAIN
+.It Bq Er ENOMSG
 There is no message of the requested type available on the message queue,
 and
 .Dv IPC_NOWAIT
 is set in
 .Fa msgflg .
+.It Bq Er EIDRM
+The message queue was removed while
+.Fn msgrcv
+was waiting for a message of the requested type to become available on it.
 .El
 .Sh SEE ALSO
 .Xr msgctl 2 ,
@@ -199,14 +199,3 @@ is set in
 .Xr msgsnd 2
 .Sh HISTORY
 Message queues appeared in the first release of AT&T Unix System V.
-.Sh BUGS
-.Ox
-does not define the
-.Er EIDRM
-error value, which should be used in
-the case of a removed message queue, nor the
-.Er ENOMSG
-value, which
-should be used when no suitable message is available and
-.Dv IPC_NOWAIT
-is set.
diff --git a/lib/libc/sys/msgsnd.2 b/lib/libc/sys/msgsnd.2
index bc1093da11c..4b648529feb 100644
--- a/lib/libc/sys/msgsnd.2
+++ b/lib/libc/sys/msgsnd.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msgsnd.2,v 1.15 2007/05/31 19:19:33 jmc Exp $
+.\"	$OpenBSD: msgsnd.2,v 1.16 2007/09/03 14:37:52 millert Exp $
 .\"	$NetBSD: msgsnd.2,v 1.2 1997/03/27 08:20:36 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -30,7 +30,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"/
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 3 2007 $
 .Dt MSGSND 2
 .Os
 .Sh NAME
@@ -132,11 +132,6 @@ will fail if:
 .Fa msqid
 is not a valid message queue identifier.
 .Pp
-The message queue was removed while
-.Fn msgsnd
-was waiting for a resource to become available in order to deliver the
-message.
-.Pp
 .Fa msgsz
 is greater than
 .Va msg_qbytes .
@@ -153,6 +148,11 @@ was set in
 points to an invalid address.
 .It Bq Er EINTR
 The system call was interrupted by the delivery of a signal.
+.It Bq Er EIDRM
+The message queue was removed while
+.Fn msgsnd
+was waiting for a resource to become available in order to deliver the
+message.
 .El
 .Sh SEE ALSO
 .Xr msgctl 2 ,
@@ -160,9 +160,3 @@ The system call was interrupted by the delivery of a signal.
 .Xr msgrcv 2
 .Sh HISTORY
 Message queues appeared in the first release of AT&T Unix System V.
-.Sh BUGS
-.Ox
-does not define the
-.Er EIDRM
-error value, which should be used
-in the case of a removed message queue.
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 3da4ae662a5..a81be6620fb 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: semop.2,v 1.14 2007/05/31 19:19:33 jmc Exp $
+.\"	$OpenBSD: semop.2,v 1.15 2007/09/03 14:37:52 millert Exp $
 .\"	$NetBSD: semop.2,v 1.1 1995/10/16 23:49:28 jtc Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -30,7 +30,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"/
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 3 2007 $
 .Dt SEMOP 2
 .Os
 .Sh NAME
@@ -127,10 +127,9 @@ will fail if:
 .It Bq Er EINVAL
 There is no semaphore associated with
 .Fa semid .
-.Pp
+.It Bq Er EIDRM
 The semaphore set was removed while the process was waiting for one of
 its semaphores to reach a certain value.
-.Pp
 .It Bq Er EACCES
 The calling process has no permission to access the specified semaphore set.
 .It Bq Er E2BIG
@@ -160,11 +159,3 @@ points to an illegal address.
 .Sh SEE ALSO
 .Xr semctl 2 ,
 .Xr semget 2
-.Sh BUGS
-In case of a removed semaphore identifier,
-.Va errno
-should be set to
-.Er EIDRM ,
-but
-.Ox
-does not define this error.