Changeset 62 for trunk/lock.c

Timestamp:

06/05/2006 07:14:19 AM (7 years ago)

Author:

moo

Message:

use %TEMP %TMP for win32 (or $TEMP $TMP for *NIX)

Files:

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

trunk/lock.c

@@ -6 +6 @@
 #ifndef ZEND_WIN32
 typedef int HANDLE;
+#   ifndef INVALID_HANDLE_VALUE
+#       define INVALID_HANDLE_VALUE -1
+#   endif
 #   define CloseHandle(h) close(h)
 #endif
@@ -72 +75 @@
 {
     HANDLE fd;
-    char myname[sizeof("/tmp/.xcache.lock") - 1 + 100];
+    xc_lock_t *lck;
+    int size;
+    char *myname;
 
     if (pathname == NULL) {
         static int i = 0;
-        snprintf(myname, sizeof(myname) - 1, "/tmp/.xcache.%d.%d.%d.lock", (int) getuid(), i ++, rand());
+        const char default_tmpdir[] = { DEFAULT_SLASH, 't', 'm', 'p', '\0' };
+        const char *tmpdir;
+
+        tmpdir = getenv("TEMP");
+        if (!tmpdir) {
+            tmpdir = getenv("TMP");
+            if (!tmpdir) {
+                tmpdir = default_tmpdir;
+            }
+        }
+        size = strlen(tmpdir) + sizeof("/.xcache.lock") - 1 + 3 * 10 + 100;
+        myname = do_alloca(size);
+        snprintf(myname, size - 1, "%s%c.xcache.%d.%d.%d.lock", tmpdir, DEFAULT_SLASH, (int) getuid(), i ++, rand());
         pathname = myname;
+    }
+    else {
+        myname = NULL;
     }
 
     fd = (HANDLE) open(pathname, O_RDWR|O_CREAT, 0666);
 
-    if (fd > 0) {
-        xc_lock_t *lck = malloc(sizeof(lck[0]));
-        int size;
+    if (fd != INVALID_HANDLE_VALUE) {
+        lck = malloc(sizeof(lck[0]));
 
 #ifndef __CYGWIN__
@@ -93 +112 @@
         lck->pathname = malloc(size);
         memcpy(lck->pathname, pathname, size);
-        return lck;
     }
     else {
         fprintf(stderr, "xc_fcntl_create: open(%s, O_RDWR|O_CREAT, 0666) failed:", pathname);
-        return NULL;
+        lck = NULL;
     }
+
+    if (myname) {
+        free_alloca(myname);
+    }
+
+    return lck;
 }
 /* }}} */