X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=index%2Flockidx.c;h=1469f013399c8d2d2c4e1fa4c56c0873ba1af027;hb=45a6ad99e5210bc4ef39bf00d81aee8f0fb26168;hp=730a2bf79f980a804bcdeeaf058b88ac96879214;hpb=e89f9552c15bc7f95c0495457a36ac45914fcb40;p=idzebra-moved-to-github.git

diff --git a/index/lockidx.c b/index/lockidx.c
index 730a2bf..1469f01 100644
--- a/index/lockidx.c
+++ b/index/lockidx.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockidx.c,v $
- * Revision 1.15  1998-02-17 10:31:33  adam
+ * Revision 1.17  1999-12-08 15:03:11  adam
+ * Implemented bf_reset.
+ *
+ * Revision 1.16  1999/02/02 14:50:57  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.15  1998/02/17 10:31:33  adam
  * Fixed bug in zebraIndexUnlock. On NT, the lock files wasn't removed.
  *
  * Revision 1.14  1998/01/12 15:04:08  adam
@@ -61,7 +67,7 @@
  */
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -116,7 +122,7 @@ int zebraIndexWait (int commitPhase)
         h = server_lock_org;
     if (zebra_lock_nb (h))
     {
-#ifndef WINDOWS
+#ifndef WIN32
         if (errno != EWOULDBLOCK)
         {
             logf (LOG_FATAL|LOG_ERRNO, "flock");
@@ -164,10 +170,11 @@ void zebraIndexUnlock (void)
     char path[1024];
     
     zebra_lock_destroy (server_lock_main);
+    server_lock_main = 0;
     zebra_lock_prefix (common_resource, path);
     strcat (path, FNAME_MAIN_LOCK);
-    if (unlink (path))
-        logf (LOG_WARN|LOG_ERRNO, "unlink %s", path);
+    if (unlink (path) && errno != ENOENT)
+        logf (LOG_WARN|LOG_ERRNO, "unlink %s failed", path);
 }
 
 void zebraIndexLock (BFiles bfs, int commitNow, const char *rval)
@@ -196,7 +203,7 @@ void zebraIndexLock (BFiles bfs, int commitNow, const char *rval)
             }
             if (zebra_lock_nb (server_lock_main) == -1)
             {
-#ifdef WINDOWS
+#ifdef WIN32
                 logf (LOG_LOG, "waiting for other index process");
                 zebra_lock (server_lock_main);
                 zebra_unlock (server_lock_main);