Fixed arguments to nodetogr

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

diff --git a/index/lockutil.c b/index/lockutil.c
index 79dd0dc..d59067f 100644 (file)
--- a/index/lockutil.c
+++ b/index/lockutil.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockutil.c,v $
- * Revision 1.2  1995-12-11 11:43:29  adam
+ * Revision 1.5  1996-03-26 16:01:13  adam
+ * New setting lockPath: directory of various lock files.
+ *
+ * Revision 1.4  1995/12/13  08:46:10  adam
+ * Locking uses F_WRLCK and F_RDLCK again!
+ *
+ * Revision 1.3  1995/12/12  16:00:57  adam
+ * System call sync(2) used after update/commit.
+ * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
+ * and F_RDLCK.
+ *
+ * Revision 1.2  1995/12/11  11:43:29  adam
  * Locking based on fcntl instead of flock.
  * Setting commitEnable removed. Command line option -n can be used to
  * prevent commit if commit setting is defined in the configuration file.
@@ -29,7 +40,7 @@ static char *lockDir = NULL;
 void zebraLockPrefix (char *pathPrefix)
 {
     if (!lockDir)
-        lockDir = res_get_def (common_resource, "lockDir", "");
+        lockDir = res_get_def (common_resource, "lockPath", "");
     assert (lockDir);
     
     strcpy (pathPrefix, lockDir);
@@ -48,12 +59,20 @@ static int intLock (int fd, int type, int cmd)
 
 int zebraLock (int fd, int wr)
 {
+#if 0
+    return intLock (fd, wr ? F_EXLCK : F_SHLCK, F_SETLKW);
+#else
     return intLock (fd, wr ? F_WRLCK : F_RDLCK, F_SETLKW);
+#endif
 }
 
 int zebraLockNB (int fd, int wr)
 {
+#if 0
+    return intLock (fd, wr ? F_EXLCK : F_SHLCK, F_SETLK);
+#else
     return intLock (fd, wr ? F_WRLCK : F_RDLCK, F_SETLK);
+#endif
 }
 
 int zebraUnlock (int fd)