Hook up flock() compat code.

Also a couple of minor changes: fail if we can't lock instead of
silently succeeding, and apply a couple of minor style fixes.

1 files changed, 8 insertions, 3 deletions

diff --git a/openbsd-compat/bsd-flock.c b/openbsd-compat/bsd-flock.c
index 4a51ebe13..bf4d8a658 100644
--- a/openbsd-compat/bsd-flock.c
+++ b/openbsd-compat/bsd-flock.c
@@ -34,13 +34,15 @@
  * Otherwise, don't do locking; just pretend success.
  */
 
-#include "nbtool_config.h"
+#include "includes.h"
 
-#if !HAVE_FLOCK
+#ifndef HAVE_FLOCK
 #include <errno.h>
 #include <fcntl.h>
 
-int flock(int fd, int op) {
+int
+flock(int fd, int op)
+{
         int rc = 0;
 
 #if defined(F_SETLK) && defined(F_SETLKW)
@@ -69,6 +71,9 @@ int flock(int fd, int op) {
 
         if (rc && (errno == EAGAIN))
                 errno = EWOULDBLOCK;
+#else
+        rc = -1
+        errno = ENOSYS;
 #endif
 
         return rc;