X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1c91be5784ddebaa6a54f1f2c42a8016f10af6de..83ffa51bdfbcf4e1f93e57fb64d57ddbeeeb2304:/sbr/lock_file.c?ds=inline

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index b8e47dfc..a8a98118 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -495,7 +495,7 @@ lkopen_dot (const char *file, int access, mode_t mode, int *failed_to_lock)
 #if !defined(HAVE_LIBLOCKFILE)
     {
 	int i;
-	for (i = 0;;) {
+	for (i = 0; i < LOCK_RETRIES; ++i) {
 	    /* attempt to create lock file */
 	    if (lockit (&lkinfo) == 0) {
 		/* if successful, turn on timer and return */
@@ -504,29 +504,30 @@ lkopen_dot (const char *file, int access, mode_t mode, int *failed_to_lock)
 	    } else {
 		/*
 		 * Abort locking, if we fail to lock after 5 attempts
-		 * and are never able to stat the lock file.
+		 * and are never able to stat the lock file.  Or, if
+		 * we can stat the lockfile but exceed LOCK_RETRIES
+		 * seconds waiting for it (by falling out of the loop).
 		 */
 		struct stat st;
 		if (stat (lkinfo.curlock, &st) == -1) {
-		    if (i++ > 5) {
-			*failed_to_lock = 1;
-			return -1;
-                    }
-		    sleep (5);
+		    if (i++ > 5) break;
+		    sleep (1);
 		} else {
 		    time_t curtime;
-		    i = 0;
 		    time (&curtime);
 		    
 		    /* check for stale lockfile, else sleep */
 		    if (curtime > st.st_ctime + RSECS)
 			(void) m_unlink (lkinfo.curlock);
 		    else
-			sleep (5);
+			sleep (1);
 		}
 		lockname (file, &lkinfo, 1);
 	    }
 	}
+
+        *failed_to_lock = 1;
+        return -1;
     }
 #else
     if (lockfile_create(lkinfo.curlock, 5, 0) == L_SUCCESS) {
@@ -560,7 +561,7 @@ lockit (struct lockinfo *li)
     curlock = li->curlock;
 
     if ((tmpfile = m_mktemp(li->tmplock, &fd, NULL)) == NULL) {
-        advise(NULL, "unable to create temporary file in %s", get_temp_dir());
+        advise(NULL, "unable to create temporary file in %s", li->tmplock);
 	return -1;
     }