X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=cbits%2FlockFile.c;h=721246b126699532c8a213a6a8e8d1439f3fc991;hb=4b26136ab82fb1ff12e49477c4833a9586d368c5;hp=0abfb9079e874ff0f9c629bb1d0358e7c6ef5ec6;hpb=91ad6d44f7b29d2ede170e3106042b36c9904da1;p=haskell-directory.git

diff --git a/cbits/lockFile.c b/cbits/lockFile.c
index 0abfb90..721246b 100644
--- a/cbits/lockFile.c
+++ b/cbits/lockFile.c
@@ -1,16 +1,16 @@
-/* 
- * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
+/*
+ * (c) The GRASP/AQUA Project, Glasgow University, 1994-2004
  *
- * $Id: lockFile.c,v 1.2 2002/02/07 11:13:30 simonmar Exp $
+ * $Id: lockFile.c,v 1.5 2005/01/28 13:36:32 simonmar Exp $
  *
  * stdin/stout/stderr Runtime Support
  */
 
-#include "HsBase.h"
+#if !(defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32))
 
-#ifndef FD_SETSIZE
-#define FD_SETSIZE 256
-#endif
+#include "HsBase.h"
+#include "Rts.h"
+#include "RtsUtils.h"
 
 typedef struct {
     dev_t device;
@@ -30,30 +30,21 @@ lockFile(int fd, int for_writing, int exclusive)
     struct stat sb;
     int i;
 
+    if (fd > FD_SETSIZE) {
+	barf("lockFile: fd out of range");
+    }
+
     while (fstat(fd, &sb) < 0) {
-	if (errno != EINTR) {
-#ifndef _WIN32
+	if (errno != EINTR)
 	    return -1;
-#else
-	    /* fstat()ing socket fd's seems to fail with CRT's fstat(),
-	       so let's just silently return and hope for the best..
-	    */
-	    return 0;
-#endif
-	}
     }
 
     if (for_writing) {
       /* opening a file for writing, check to see whether
          we don't have any read locks on it already.. */
       for (i = 0; i < readLocks; i++) {
-	 if (readLock[i].inode == sb.st_ino && readLock[i].device == sb.st_dev) {
-#ifndef __MINGW32__
+	 if (readLock[i].inode == sb.st_ino && readLock[i].device == sb.st_dev)
 	    return -1;
-#else
-	    break;    
-#endif
-	 }	    
       }
       /* If we're determined that there is only a single
          writer to the file, check to see whether the file
@@ -62,11 +53,7 @@ lockFile(int fd, int for_writing, int exclusive)
       if (exclusive) {
 	for (i = 0; i < writeLocks; i++) {
 	  if (writeLock[i].inode == sb.st_ino && writeLock[i].device == sb.st_dev) {
-#ifndef __MINGW32__
 	     return -1;
-#else
-	     break;
-#endif
 	  }
         }
       }
@@ -76,17 +63,12 @@ lockFile(int fd, int for_writing, int exclusive)
       writeLock[i].inode = sb.st_ino;
       writeLock[i].fd = fd;
       return 0;
-    } else { 
+    } else {
       /* For reading, it's simpler - just check to see
          that there's no-one writing to the underlying file. */
       for (i = 0; i < writeLocks; i++) {
-	if (writeLock[i].inode == sb.st_ino && writeLock[i].device == sb.st_dev) {
-#ifndef __MINGW32__
+	if (writeLock[i].inode == sb.st_ino && writeLock[i].device == sb.st_dev)
 	     return -1;
-#else
-	     break;
-#endif
-        }
       }
       /* Fit in new entry, reusing an existing table entry, if possible. */
       for (i = 0; i < readLocks; i++) {
@@ -126,3 +108,5 @@ unlockFile(int fd)
      /* Signal that we did not find an entry */
     return 1;
 }
+
+#endif