diff options
| author |   Dag-Erling Smørgrav <des@FreeBSD.org> | 2007-08-03 06:32:45 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2007-08-03 06:32:45 +0000 |
| commit | ab8064c95587c1dbdcb93e7d90e7c1cf2663a541 (patch) | |
| tree | d554a24981f6c7994cb66e711f6dbb27f1822c93 /libutil | |
| parent | 62728a54e9ae4be5dbfe2154fcc9db74b215ba49 (diff) | |
| download | pw-darwin-ab8064c95587c1dbdcb93e7d90e7c1cf2663a541.tar.gz pw-darwin-ab8064c95587c1dbdcb93e7d90e7c1cf2663a541.tar.zst pw-darwin-ab8064c95587c1dbdcb93e7d90e7c1cf2663a541.zip | |
Use fcntl(2)-style locks instead of less-portable flock(2)-style locks.
Approved by: re (kensmith)
Diffstat (limited to 'libutil')
| -rw-r--r-- | libutil/flopen.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libutil/flopen.c b/libutil/flopen.c index 23742f7..f285ac5 100644 --- a/libutil/flopen.c +++ b/libutil/flopen.c @@ -43,6 +43,7 @@ flopen(const char *path, int flags, ...) { int fd, operation, serrno, trunc; struct stat sb, fsb; + struct flock lock; mode_t mode; #ifdef O_EXLOCK @@ -58,9 +59,11 @@ flopen(const char *path, int flags, ...) va_end(ap); } - operation = LOCK_EX; - if (flags & O_NONBLOCK) - operation |= LOCK_NB; + lock.l_type = (flags & O_RDONLY) ? F_RDLCK : F_WRLCK; + lock.l_start = 0; + lock.l_whence = SEEK_SET; + lock.l_len = 0; + operation = (flags & O_NONBLOCK) ? F_SETLK : F_SETLKW; trunc = (flags & O_TRUNC); flags &= ~O_TRUNC; @@ -69,7 +72,7 @@ flopen(const char *path, int flags, ...) if ((fd = open(path, flags, mode)) == -1) /* non-existent or no access */ return (-1); - if (flock(fd, operation) == -1) { + if (fcntl(fd, operation, &lock) == -1) { /* unsupported or interrupted */ serrno = errno; close(fd); |