diff -r 21a6c17f4e3e -r 629f61203db1 src/File.cpp
--- a/src/File.cpp	Mon Sep 28 23:39:08 2009 -0700
+++ b/src/File.cpp	Tue Sep 29 15:46:42 2009 -0700
@@ -21,14 +21,8 @@
 
 namespace Mooseyard {
     
-    File::File (const char *filename, bool writeable, bool create)  throw(Error)
-        :_fd(_check( ::open(filename, writeable ?(create ?O_RDWR|O_CREAT :O_RDWR) :O_RDONLY, 0644) )),
-         _memoryMap(NULL),
-         _locked(0)
-    { }
-
     File::File (const char *filename, int oflag, bool locked)  throw(Error)
-#if BSD
+#ifdef _DARWIN_C_SOURCE
         :_fd(_check( ::open(filename, oflag | (locked ? O_EXLOCK : 0), 0644) )),
 #else
         :_fd(_check( ::open(filename, oflag, 0644) )),
@@ -36,7 +30,7 @@
          _memoryMap(NULL),
          _locked( locked ? 1 : 0)
     {
-#if !BSDISH
+#ifndef _DARWIN_C_SOURCE
       _check( ::flock(_fd, LOCK_EX) );
 #endif
     }
@@ -59,15 +53,21 @@
     }
 
     off_t File::position() const  throw(Error) {
-        return _check( lseek(_fd,0,SEEK_CUR) );
+        off_t pos = lseek(_fd,0,SEEK_CUR);
+        if (pos < 0)
+            _check(-1);
+        return pos;
     }
     
     void File::setPosition (off_t pos)  throw(Error) {
-        _check( lseek(_fd,pos,SEEK_SET) );
+        _check( (int) lseek(_fd,pos,SEEK_SET) );
     }
     
     off_t File::setPositionToEnd (off_t bytesBefore)  throw(Error) {
-        return _check( lseek(_fd,-bytesBefore,SEEK_END) );
+        off_t pos = lseek(_fd,-bytesBefore,SEEK_END);
+        if (pos < 0)
+            _check(-1);
+        return pos;
     }
     
     void File::read (void *dst, size_t size)  throw(Error) {
@@ -111,7 +111,13 @@
     }
     
     void File::flushDisk()  throw(Error) {
-#if OSX
+#if _DARWIN_C_SOURCE
+        /* F_FULLFSYNC is Mac/Darwin specific. From the man page:
+         Does the same thing as fsync(2) then asks the drive to flush all buffered data to
+         the permanent storage device (arg is ignored).  This is currently implemented on
+         HFS, MS-DOS (FAT), and Universal Disk Format (UDF) file systems.  The operation may
+         take quite a while to complete.  Certain FireWire drives have also been known to
+         ignore the request to flush their buffered data. */
         _check( ::fcntl(_fd,F_FULLFSYNC) );
 #else
         _check( fsync(_fd) );