projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No error-checking for error-checking alloc functions
[mmh]
/
sbr
/
lock_file.c
diff --git
a/sbr/lock_file.c
b/sbr/lock_file.c
index
bdce7bb
..
7309c86
100644
(file)
--- a/
sbr/lock_file.c
+++ b/
sbr/lock_file.c
@@
-44,8
+44,10
@@
#include <lockfile.h>
#endif
#include <lockfile.h>
#endif
-#ifdef LOCKDIR
+#ifdef DOT_LOCKING
+# ifdef LOCKDIR
char *lockdir = LOCKDIR;
char *lockdir = LOCKDIR;
+# endif
#endif
/* Are we using any kernel locking? */
#endif
/* Are we using any kernel locking? */
@@
-330,7
+332,7
@@
lkopen_kernel(char *file, int access, mode_t mode)
j = errno;
close(fd);
j = errno;
close(fd);
- sleep(5);
+ sleep(1);
}
close(fd);
}
close(fd);
@@
-382,7
+384,7
@@
lkopen_dot(char *file, int access, mode_t mode)
if (stat(lkinfo.curlock, &st) == -1) {
if (i++ > 5)
return -1;
if (stat(lkinfo.curlock, &st) == -1) {
if (i++ > 5)
return -1;
- sleep(5);
+ sleep(1);
} else {
time_t curtime;
i = 0;
} else {
time_t curtime;
i = 0;
@@
-395,7
+397,7
@@
lkopen_dot(char *file, int access, mode_t mode)
if (curtime > st.st_ctime + RSECS)
unlink(lkinfo.curlock);
else
if (curtime > st.st_ctime + RSECS)
unlink(lkinfo.curlock);
else
- sleep(5);
+ sleep(1);
}
lockname(file, &lkinfo, 1);
}
}
lockname(file, &lkinfo, 1);
}