Fixed bug regarding online updates on WIN32.

[idzebra-moved-to-github.git] / index / locksrv.c

diff --git a/index/locksrv.c b/index/locksrv.c
index 7591349..176aba5 100644 (file)
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: locksrv.c,v $
- * Revision 1.12  1999-02-02 14:50:58  adam
+ * Revision 1.15  2000-12-01 17:59:08  adam
+ * Fixed bug regarding online updates on WIN32.
+ * When zebra.cfg is not available the server will not abort.
+ *
+ * Revision 1.14  2000/03/15 15:00:30  adam
+ * First work on threaded version.
+ *
+ * Revision 1.13  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.12  1999/02/02 14:50:58  adam
  * Updated WIN32 code specific sections. Changed header.
  *
  * Revision 1.11  1998/03/05 08:45:12  adam
@@ -61,23 +71,22 @@
 
 #include "zserver.h"
 
-int zebra_server_lock_init (ZebraHandle zi)
+int zebra_server_lock_init (ZebraService zi)
 {
     char path_prefix[1024];
 
-    assert (zi->res);
     zi->server_lock_cmt = NULL;
     zi->server_lock_org = NULL;
 
     zebra_lock_prefix (zi->res, path_prefix);
-    zi->server_path_prefix = xmalloc (strlen(path_prefix)+1);
+    zi->server_path_prefix = (char *) xmalloc (strlen(path_prefix)+1);
     strcpy (zi->server_path_prefix, path_prefix);
 
     logf (LOG_DEBUG, "Locking system initialized");
     return 0;
 }
 
-int zebra_server_lock_destroy (ZebraHandle zi)
+int zebra_server_lock_destroy (ZebraService zi)
 {
     xfree (zi->server_path_prefix);
     zebra_lock_destroy (zi->server_lock_cmt);
@@ -86,7 +95,7 @@ int zebra_server_lock_destroy (ZebraHandle zi)
     return 0;
 }
 
-int zebra_server_lock (ZebraHandle zi, int commitPhase)
+int zebra_server_lock (ZebraService zi, int commitPhase)
 {
     if (!zi->server_lock_cmt)
     {
@@ -122,7 +131,7 @@ int zebra_server_lock (ZebraHandle zi, int commitPhase)
     return 0;
 }
 
-void zebra_server_unlock (ZebraHandle zi, int commitPhase)
+void zebra_server_unlock (ZebraService zi, int commitPhase)
 {
     if (zi->server_lock_org == NULL)
         return;
@@ -138,7 +147,7 @@ void zebra_server_unlock (ZebraHandle zi, int commitPhase)
     }
 }
 
-int zebra_server_lock_get_state (ZebraHandle zi, time_t *timep)
+int zebra_server_lock_get_state (ZebraService zi, time_t *timep)
 {
     char path[1024];
     char buf[256];
@@ -150,7 +159,7 @@ int zebra_server_lock_get_state (ZebraHandle zi, time_t *timep)
     if (stat (path, &xstat) == -1)
         *timep = 1;
     else
-        *timep = xstat.st_ctime;
+        *timep = xstat.st_mtime;
 
     strcpy (path, zi->server_path_prefix);
     strcat (path, FNAME_MAIN_LOCK);