From e2a39e2efa3337b9c6abbba4c7eb914c5ee9d3d9 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 3 Dec 2003 09:55:42 +0000 Subject: * fcntl.cc (fcntl_worker): Remove static storage class. * flock.cc (flock): Use struct __flock64. Call fcntl_worker. Use Cygwin errno functions instead of accessing errno directly. * winsup.h: Declare fcntl_worker. --- winsup/cygwin/flock.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'winsup/cygwin/flock.cc') diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc index 09ea2b6db..b15962d94 100644 --- a/winsup/cygwin/flock.cc +++ b/winsup/cygwin/flock.cc @@ -15,9 +15,9 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ +#include "winsup.h" +#include "cygerrno.h" #include -#include -#include #include #include @@ -25,7 +25,7 @@ int flock (int fd, int operation) { int i, cmd; - struct flock l = { 0, 0, 0, 0, 0 }; + struct __flock64 l = { 0, 0, 0, 0, 0 }; if (operation & LOCK_NB) { cmd = F_SETLK; @@ -39,40 +39,40 @@ flock (int fd, int operation) { case LOCK_EX: l.l_type = F_WRLCK; - i = fcntl (fd, cmd, &l); + i = fcntl_worker (fd, cmd, &l); if (i == -1) { - if ((errno == EAGAIN) || (errno == EACCES)) + if ((get_errno () == EAGAIN) || (get_errno () == EACCES)) { - errno = EWOULDBLOCK; + set_errno (EWOULDBLOCK); } } break; case LOCK_SH: l.l_type = F_RDLCK; - i = fcntl (fd, cmd, &l); + i = fcntl_worker (fd, cmd, &l); if (i == -1) { - if ((errno == EAGAIN) || (errno == EACCES)) + if ((get_errno () == EAGAIN) || (get_errno () == EACCES)) { - errno = EWOULDBLOCK; + set_errno (EWOULDBLOCK); } } break; case LOCK_UN: l.l_type = F_UNLCK; - i = fcntl (fd, cmd, &l); + i = fcntl_worker (fd, cmd, &l); if (i == -1) { - if ((errno == EAGAIN) || (errno == EACCES)) + if ((get_errno () == EAGAIN) || (get_errno () == EACCES)) { - errno = EWOULDBLOCK; + set_errno (EWOULDBLOCK); } } break; default: i = -1; - errno = EINVAL; + set_errno (EINVAL); break; } return i; -- cgit v1.2.3