X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a18840ea0d3700cd973e1188f55c27f06984b4fb..665dfc96f45c47ecfae79f1baa2c29dabe5a2ded:/sbr/lock_file.c

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 4057c4cf..0bf82f8a 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -1,6 +1,4 @@
-
-/*
- * lock.c -- routines to lock/unlock files
+/* lock_file.c -- routines to lock/unlock files
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -73,15 +71,9 @@ struct lock {
 
 enum locktype { FCNTL_LOCKING, FLOCK_LOCKING, LOCKF_LOCKING, DOT_LOCKING };
 
-/*
- * Flags to indicate whether we've initialized the lock types, and
- * our saved lock types
- */
-static int datalockinit = 0;
-static int spoollockinit = 0;
+/* Our saved lock types. */
 static enum locktype datalocktype, spoollocktype;
 
-
 /* top of list containing all open locks */
 static struct lock *l_top = NULL;
 
@@ -117,17 +109,18 @@ static int lockit (struct lockinfo *);
 int
 lkopendata(const char *file, int access, mode_t mode, int *failed_to_lock)
 {
-    if (! datalockinit) {
-    	char *cp = context_find("datalocking");
+    static bool deja_vu;
 
-	if (cp) {
-	    datalocktype = init_locktype(cp);
+    if (!deja_vu) {
+        char *dl;
+
+        deja_vu = true;
+	if ((dl = context_find("datalocking"))) {
+	    datalocktype = init_locktype(dl);
 	} else {
 	    /* We default to fcntl locking for data files */
 	    datalocktype = FCNTL_LOCKING;
 	}
-
-	datalockinit = 1;
     }
 
     return lkopen(file, access, mode, datalocktype, failed_to_lock);
@@ -140,10 +133,11 @@ lkopendata(const char *file, int access, mode_t mode, int *failed_to_lock)
 
 int lkopenspool(const char *file, int access, mode_t mode, int *failed_to_lock)
 {
-    if (! spoollockinit) {
-    	spoollocktype = init_locktype(spoollocking);
+    static bool deja_vu;
 
-	spoollockinit = 1;
+    if (!deja_vu) {
+	deja_vu = true;
+        spoollocktype = init_locktype(spoollocking);
     }
 
     return lkopen(file, access, mode, spoollocktype, failed_to_lock);
@@ -495,6 +489,8 @@ lkopen_dot (const char *file, int access, mode_t mode, int *failed_to_lock)
     {
 	int i;
 	for (i = 0; i < LOCK_RETRIES; ++i) {
+            struct stat st;
+
 	    /* attempt to create lock file */
 	    if (lockit (&lkinfo) == 0) {
 		/* if successful, turn on timer and return */
@@ -508,7 +504,6 @@ lkopen_dot (const char *file, int access, mode_t mode, int *failed_to_lock)
              * 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) break;
                 sleep (1);
@@ -559,7 +554,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", li->tmplock);
+        inform("unable to create temporary file in %s", li->tmplock);
 	return -1;
     }