Changeset 11 for trunk/lock.c

Timestamp:

2006-05-24T09:52:48+02:00 (7 years ago)

Author:

moo

Message:

make it build on windows vc compiler

File:

• trunk/lock.c (modified) (7 diffs)

trunk/lock.c

@@ -6 +6 @@
 #ifndef ZEND_WIN32
 typedef int HANDLE;
+#   define CloseHandle(h) close(h)
 #endif
 #include "lock.h"
@@ -18 +19 @@
 #   include <fcntl.h>
 #   include <errno.h>
+#   define LCK_WR F_WRLCK
+#   define LCK_RD F_RDLCK
+#   define LCK_UN F_UNLCK
+#   define LCK_NB 0
 static inline int dolock(xc_lock_t *lck, int type) /* {{{ */
 { 
@@ -35 +40 @@
 }
 /* }}} */
-#define LCK_WR F_WRLCK
-#define LCK_RD F_RDLCK
-#define LCK_UN F_UNLCK
-#define LCK_NB 0
 #else
 
@@ -46 +47 @@
 #   include <sys/types.h>
 #   include <sys/stat.h>
-#   define errno GetLastError()
+#   ifndef errno
+#       define errno GetLastError()
+#   endif
+#   define getuid() 0
+#   define LCK_WR LOCKFILE_EXCLUSIVE_LOCK
+#   define LCK_RD 0
+#   define LCK_UN 0
+#   define LCK_NB LOCKFILE_FAIL_IMMEDIATELY
 static inline int dolock(xc_lock_t *lck, int type) /* {{{ */
 { 
@@ -52 +60 @@
 
     if (type == LCK_UN) {
-        return UnlockFileEx((HANDLE)fd, 0, 1, 0, &offset);
+        return UnlockFileEx((HANDLE)lck->fd, 0, 1, 0, &offset);
     }
     else {
-        return LockFileEx((HANDLE)fd, type, 0, 1, 0, &offset);
+        return LockFileEx((HANDLE)lck->fd, type, 0, 1, 0, &offset);
     }
 }
 /* }}} */
-#define LCK_WR LOCKFILE_EXCLUSIVE_LOCK
-#define LCK_RD 0
-#define LCK_UN 0
-#define LCK_NB LOCKFILE_FAIL_IMMEDIATELY
 #endif
 
@@ -68 +72 @@
 {
     HANDLE fd;
-    char myname[sizeof("/tmp/.xcache.lock") - 1 + 20];
+    char myname[sizeof("/tmp/.xcache.lock") - 1 + 100];
 
     if (pathname == NULL) {
         static int i = 0;
-        snprintf(myname, sizeof(myname) - 1, "/tmp/.xcache.%d.%d.lock", (int) getuid(), i ++);
+        snprintf(myname, sizeof(myname) - 1, "/tmp/.xcache.%d.%d.%d.lock", (int) getuid(), i ++, rand());
         pathname = myname;
     }
 
-    fd = open(pathname, O_RDWR|O_CREAT, 0666);
+    fd = (HANDLE) open(pathname, O_RDWR|O_CREAT, 0666);
 
     if (fd > 0) {
@@ -99 +103 @@
 void xc_fcntl_destroy(xc_lock_t *lck) /* {{{ */
 {   
-    close(lck->fd);
+    CloseHandle(lck->fd);
 #ifdef __CYGWIN__
     unlink(lck->pathname);