diff options
| author | cgd <cgd@NetBSD.org> | 1995-02-27 12:31:34 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 1995-02-27 12:31:34 +0000 |
| commit | 4eab61bd40c07b2fc612ad50cface2b77fc110d0 (patch) | |
| tree | 7118747f1d9919499fdea5d7c6908c5cfe04e5a8 /lib/libc/sys/flock.2 | |
| parent | c67e54a2e2b9f3d455a30d68ea4e09e56d7b9136 (diff) | |
merge with lite, keeping most local changes. clean up Ids
Diffstat (limited to 'lib/libc/sys/flock.2')
| -rw-r--r-- | lib/libc/sys/flock.2 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2 index ea3f081a1c6..135e4bb48d9 100644 --- a/lib/libc/sys/flock.2 +++ b/lib/libc/sys/flock.2 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1983, 1991 The Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: flock.2,v 1.5 1995/02/27 12:32:32 cgd Exp $ +.\" +.\" Copyright (c) 1983, 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)flock.2 6.7 (Berkeley) 3/10/91 -.\" $Id: flock.2,v 1.4 1993/11/29 21:25:06 jtc Exp $ +.\" @(#)flock.2 8.2 (Berkeley) 12/11/93 .\" -.Dd March 10, 1991 +.Dd December 11, 1993 .Dt FLOCK 2 .Os BSD 4.2 .Sh NAME @@ -54,11 +55,11 @@ lock on the file associated with the file descriptor .Fa fd . A lock is applied by specifying an .Fa operation -parameter that is the inclusive or of +parameter that is one of .Dv LOCK_SH or .Dv LOCK_EX -and, possibly, +with the optional addition of .Dv LOCK_NB . To unlock an existing lock |
