Sun Jun 21 17:52:42 2009 UTC ()
Fix pastos. From Jukka Salmi in PR 41605, with a very minor adjustment.


(dholland)
diff -r1.17 -r1.18 src/lib/libc/sys/semctl.2
diff -r1.19 -r1.20 src/lib/libc/sys/shmctl.2

cvs diff -r1.17 -r1.18 src/lib/libc/sys/semctl.2 (expand / switch to unified diff)

--- src/lib/libc/sys/semctl.2 2008/05/06 20:25:09 1.17
+++ src/lib/libc/sys/semctl.2 2009/06/21 17:52:42 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: semctl.2,v 1.17 2008/05/06 20:25:09 njoly Exp $ 1.\" $NetBSD: semctl.2,v 1.18 2009/06/21 17:52:42 dholland Exp $
2.\" 2.\"
3.\" Copyright (c) 1995 Frank van der Linden 3.\" Copyright (c) 1995 Frank van der Linden
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 3. All advertising materials mentioning features or use of this software 14.\" 3. All advertising materials mentioning features or use of this software
@@ -140,39 +140,39 @@ and @@ -140,39 +140,39 @@ and
140fields in the structure associated with the semaphore. 140fields in the structure associated with the semaphore.
141The values are taken from the corresponding fields in the structure 141The values are taken from the corresponding fields in the structure
142pointed to by 142pointed to by
143.Fa arg.buf , 143.Fa arg.buf ,
144there 144there
145.Fa arg 145.Fa arg
146is the fourth argument to 146is the fourth argument to
147.Fn semctl . 147.Fn semctl .
148This operation can only be executed by the super-user, or a process that 148This operation can only be executed by the super-user, or a process that
149has an effective user id equal to either 149has an effective user id equal to either
150.Va sem_perm.cuid 150.Va sem_perm.cuid
151or 151or
152.Va sem_perm.uid 152.Va sem_perm.uid
153in the data structure associated with the message queue. 153in the data structure associated with the semaphore.
154.It Dv IPC_RMID 154.It Dv IPC_RMID
155Remove the semaphores associated with 155Remove the semaphores associated with
156.Fa semid 156.Fa semid
157from the system and destroy the data structures associated with it. 157from the system and destroy the data structures associated with it.
158Only the super-user or a process with an effective uid equal to the 158Only the super-user or a process with an effective uid equal to the
159.Va sem_perm.cuid 159.Va sem_perm.cuid
160or 160or
161.Va sem_perm.uid 161.Va sem_perm.uid
162values in the data structure associated with the semaphore can do this. 162values in the data structure associated with the semaphore can do this.
163.El 163.El
164.Pp 164.Pp
165The permission to read or change a message queue (see 165The permission to read or change a semaphore (see
166.Xr semop 2 ) 166.Xr semop 2 )
167is determined by the 167is determined by the
168.Va sem_perm.mode 168.Va sem_perm.mode
169field in the same way as is 169field in the same way as is
170done with files (see 170done with files (see
171.Xr chmod 2 ) , 171.Xr chmod 2 ) ,
172but the effective uid can match either the 172but the effective uid can match either the
173.Va sem_perm.cuid 173.Va sem_perm.cuid
174field or the 174field or the
175.Va sem_perm.uid 175.Va sem_perm.uid
176field, and the 176field, and the
177effective gid can match either 177effective gid can match either
178.Va sem_perm.cgid 178.Va sem_perm.cgid
@@ -199,27 +199,27 @@ set to reflect the error. @@ -199,27 +199,27 @@ set to reflect the error.
199will fail if: 199will fail if:
200.Bl -tag -width Er 200.Bl -tag -width Er
201.It Bq Er EPERM 201.It Bq Er EPERM
202.Fa cmd 202.Fa cmd
203is equal to 203is equal to
204.Dv IPC_SET 204.Dv IPC_SET
205or 205or
206.Dv IPC_RMID 206.Dv IPC_RMID
207and the caller is not the super-user, nor does 207and the caller is not the super-user, nor does
208the effective uid match either the 208the effective uid match either the
209.Va sem_perm.uid 209.Va sem_perm.uid
210or 210or
211.Va sem_perm.cuid 211.Va sem_perm.cuid
212fields of the data structure associated with the message queue. 212fields of the data structure associated with the semaphore.
213.It Bq Er EACCES 213.It Bq Er EACCES
214The caller has no operation permission for this semaphore. 214The caller has no operation permission for this semaphore.
215.It Bq Er EINVAL 215.It Bq Er EINVAL
216.Fa semid 216.Fa semid
217is not a valid message semaphore identifier. 217is not a valid message semaphore identifier.
218.Pp 218.Pp
219.Va cmd 219.Va cmd
220is not a valid command. 220is not a valid command.
221.It Bq Er EFAULT 221.It Bq Er EFAULT
222.Fa arg.buf 222.Fa arg.buf
223or 223or
224.Fa arg.array 224.Fa arg.array
225specifies an invalid address. 225specifies an invalid address.

cvs diff -r1.19 -r1.20 src/lib/libc/sys/shmctl.2 (expand / switch to unified diff)

--- src/lib/libc/sys/shmctl.2 2006/12/31 03:17:52 1.19
+++ src/lib/libc/sys/shmctl.2 2009/06/21 17:52:42 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: shmctl.2,v 1.19 2006/12/31 03:17:52 uebayasi Exp $ 1.\" $NetBSD: shmctl.2,v 1.20 2009/06/21 17:52:42 dholland Exp $
2.\" 2.\"
3.\" Copyright (c) 1995 Frank van der Linden 3.\" Copyright (c) 1995 Frank van der Linden
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 3. All advertising materials mentioning features or use of this software 14.\" 3. All advertising materials mentioning features or use of this software
@@ -102,27 +102,27 @@ This operation can only be executed by t @@ -102,27 +102,27 @@ This operation can only be executed by t
102has an effective user id equal to either 102has an effective user id equal to either
103.Va shm_perm.cuid 103.Va shm_perm.cuid
104or 104or
105.Va shm_perm.uid 105.Va shm_perm.uid
106in the data structure associated with the shared memory segment. 106in the data structure associated with the shared memory segment.
107.It Dv IPC_RMID 107.It Dv IPC_RMID
108Remove the shared memory segment specified by 108Remove the shared memory segment specified by
109.Fa shmid 109.Fa shmid
110and destroy the data associated with it. 110and destroy the data associated with it.
111Only the super-user or a process with an effective uid equal to the 111Only the super-user or a process with an effective uid equal to the
112.Va shm_perm.cuid 112.Va shm_perm.cuid
113or 113or
114.Va shm_perm.uid 114.Va shm_perm.uid
115values in the data structure associated with the queue can do this. 115values in the data structure associated with the segment can do this.
116.It Dv SHM_LOCK 116.It Dv SHM_LOCK
117Lock the shared memory segment specified by 117Lock the shared memory segment specified by
118.Fa shmid 118.Fa shmid
119in memory. 119in memory.
120This operation can only be executed by the super-user. 120This operation can only be executed by the super-user.
121.It Dv SHM_UNLOCK 121.It Dv SHM_UNLOCK
122Unlock the shared memory segment specified by 122Unlock the shared memory segment specified by
123.Fa shmid . 123.Fa shmid .
124This operation can only be executed by the super-user. 124This operation can only be executed by the super-user.
125.El 125.El
126.Pp 126.Pp
127The read and write permissions on a shared memory identifier 127The read and write permissions on a shared memory identifier
128are determined by the 128are determined by the