projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Charmap work
[idzebra-moved-to-github.git]
/
index
/
lockutil.c
diff --git
a/index/lockutil.c
b/index/lockutil.c
index
d626d70
..
d59067f
100644
(file)
--- a/
index/lockutil.c
+++ b/
index/lockutil.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lockutil.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lockutil.c,v $
- * Revision 1.3 1995-12-12 16:00:57 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.
* 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.
@@
-34,7
+40,7
@@
static char *lockDir = NULL;
void zebraLockPrefix (char *pathPrefix)
{
if (!lockDir)
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);
assert (lockDir);
strcpy (pathPrefix, lockDir);
@@
-53,7
+59,7
@@
static int intLock (int fd, int type, int cmd)
int zebraLock (int fd, int wr)
{
int zebraLock (int fd, int wr)
{
-#if 1
+#if 0
return intLock (fd, wr ? F_EXLCK : F_SHLCK, F_SETLKW);
#else
return intLock (fd, wr ? F_WRLCK : F_RDLCK, F_SETLKW);
return intLock (fd, wr ? F_EXLCK : F_SHLCK, F_SETLKW);
#else
return intLock (fd, wr ? F_WRLCK : F_RDLCK, F_SETLKW);
@@
-62,10
+68,10
@@
int zebraLock (int fd, int wr)
int zebraLockNB (int fd, int wr)
{
int zebraLockNB (int fd, int wr)
{
-#if 1
- return intLock (fd, wr ? F_EXLCK : F_SHLCK, F_SETLKW);
+#if 0
+ return intLock (fd, wr ? F_EXLCK : F_SHLCK, F_SETLK);
#else
#else
- return intLock (fd, wr ? F_WRLCK : F_RDLCK, F_SETLKW);
+ return intLock (fd, wr ? F_WRLCK : F_RDLCK, F_SETLK);
#endif
}
#endif
}