diff -r 851de24ecb61 -r 21a6c17f4e3e src/File.cpp
--- a/src/File.cpp	Sun Sep 20 21:25:47 2009 -0700
+++ b/src/File.cpp	Mon Sep 28 23:39:08 2009 -0700
@@ -10,6 +10,7 @@
 #include "File.h"
 #include "MemoryMap.h"
 
+#include <sys/file.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -26,11 +27,19 @@
          _locked(0)
     { }
 
-    File::File (const char *filename, int oflag)  throw(Error)
+    File::File (const char *filename, int oflag, bool locked)  throw(Error)
+#if BSD
+        :_fd(_check( ::open(filename, oflag | (locked ? O_EXLOCK : 0), 0644) )),
+#else
         :_fd(_check( ::open(filename, oflag, 0644) )),
+#endif
          _memoryMap(NULL),
-         _locked( (oflag | O_EXLOCK) ?1 :0)
-    { }
+         _locked( locked ? 1 : 0)
+    {
+#if !BSDISH
+      _check( ::flock(_fd, LOCK_EX) );
+#endif
+    }
 
     File::~File() {
         delete _memoryMap;
@@ -102,7 +111,11 @@
     }
     
     void File::flushDisk()  throw(Error) {
+#if OSX
         _check( ::fcntl(_fd,F_FULLFSYNC) );
+#else
+        _check( fsync(_fd) );
+#endif
     }
     
     bool File::hasPath (const char *path) const  throw(Error) {