From fc69f1aed5ddfc7af997b90131b8d453eec4fbfb Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 12 Mar 2009 18:30:29 +0000 Subject: * flock.cc (fhandler_disk_file::lock): Don't test file open mode in case of flock-type locks. Explain why. --- winsup/cygwin/flock.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/flock.cc') diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc index 42941cb78..964156ca0 100644 --- a/winsup/cygwin/flock.cc +++ b/winsup/cygwin/flock.cc @@ -652,14 +652,19 @@ fhandler_disk_file::lock (int a_op, struct __flock64 *fl) a_op = F_UNLCK; break; case F_RDLCK: - if (!(get_access () & GENERIC_READ)) + /* flock semantics don't specify a requirement that the file has + been opened with a specific open mode, in contrast to POSIX locks + which require that a file is opened for reading to place a read + lock and opened for writing to place a write lock. */ + if ((a_flags & F_POSIX) && !(get_access () & GENERIC_READ)) { set_errno (EBADF); return -1; } break; case F_WRLCK: - if (!(get_access () & GENERIC_WRITE)) + /* See above comment. */ + if ((a_flags & F_POSIX) && !(get_access () & GENERIC_WRITE)) { set_errno (EBADF); return -1; -- cgit v1.2.3