Use fcntl(2)-style locks instead of non-portable flock(2)-style locks.

Based on Theo Schlossnagle's Solaris portability patch.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1787 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/lib/libvarnish/flopen.c b/varnish-cache/lib/libvarnish/flopen.c
index 94f08d302e3a3482be3d4e098f1e75cab206b360..3ffe096c6bc784d9aee121104e0fa44f5a6062b4 100644 (file)
--- a/varnish-cache/lib/libvarnish/flopen.c
+++ b/varnish-cache/lib/libvarnish/flopen.c
@@ -44,6 +44,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
@@ -59,9 +60,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_WRONLY || flags & O_RDWR) ? F_WRLCK : F_RDLCK;
+       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;
@@ -70,7 +73,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);

diff --git a/varnish-cache/lib/libvarnish/vpf.c b/varnish-cache/lib/libvarnish/vpf.c
index 857cc7c0b933e414118cfd8af8af01a5c375dc5d..fa178747191f2db11e63b56990b0fb90377fdcdd 100644 (file)
--- a/varnish-cache/lib/libvarnish/vpf.c
+++ b/varnish-cache/lib/libvarnish/vpf.c
@@ -32,12 +32,12 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
-#include <errno.h>
+#include <unistd.h>
 
 #ifndef HAVE_STRLCPY
 #include "compat/strlcpy.h"
@@ -222,8 +222,14 @@ vpf_close(struct pidfh *pfh)
 static int
 _vpf_remove(struct pidfh *pfh, int freeit)
 {
+       struct flock lock;
        int error;
 
+       lock.l_type = F_UNLCK;
+       lock.l_start = 0;
+       lock.l_whence = SEEK_SET;
+       lock.l_len = 0;
+
        error = vpf_verify(pfh);
        if (error != 0) {
                errno = error;
@@ -232,7 +238,7 @@ _vpf_remove(struct pidfh *pfh, int freeit)
 
        if (unlink(pfh->pf_path) == -1)
                error = errno;
-       if (flock(pfh->pf_fd, LOCK_UN) == -1) {
+       if (fcntl(pfh->pf_fd, F_SETLK, &lock) == -1) {
                if (error == 0)
                        error = errno;
        }