crawl_folders.h: Base header on implementation.

[nmh] / sbr / lock_file.c

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index cac80c1b1abfb79df361aad308116fc6c704bcc5..f8e4b6c7b08cdbf779865c7902e12c43f332e7d1 100644 (file)
--- 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
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -15,10 +13,14 @@
  * Ruud de Rooij <ruud@debian.org>  Sun, 28 Mar 1999 15:34:03 +0200
  */
  
  * Ruud de Rooij <ruud@debian.org>  Sun, 28 Mar 1999 15:34:03 +0200
  */
  

-#include <h/mh.h>
-#include <h/signals.h>
-#include <h/utils.h>
-#include <h/mts.h>
+#include "h/mh.h"
+#include "context_find.h"
+#include "error.h"
+#include "h/signals.h"
+#include "h/utils.h"
+#include "h/mts.h"
+#include "lock_file.h"
+#include "m_mktemp.h"

 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>


@@ -73,15 +75,9 @@ struct lock {
 
 enum locktype { FCNTL_LOCKING, FLOCK_LOCKING, LOCKF_LOCKING, DOT_LOCKING };
 
 
 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;
 
 static enum locktype datalocktype, spoollocktype;
 

-

 /* top of list containing all open locks */
 static struct lock *l_top = NULL;
 
 /* top of list containing all open locks */
 static struct lock *l_top = NULL;
 


@@ -96,7 +92,7 @@ static int lkopen_lockf (const char *, int, mode_t, int *);
 static int lkopen_flock (const char *, int, mode_t, int *);
 #endif /* HAVE_FLOCK */
 
 static int lkopen_flock (const char *, int, mode_t, int *);
 #endif /* HAVE_FLOCK */
 

-static enum locktype init_locktype(const char *);
+static enum locktype init_locktype(const char *) PURE;

 
 static int lkopen_dot (const char *, int, mode_t, int *);
 static void lkclose_dot (int, const char *);
 
 static int lkopen_dot (const char *, int, mode_t, int *);
 static void lkclose_dot (int, const char *);


@@ -117,17 +113,18 @@ static int lockit (struct lockinfo *);
 int
 lkopendata(const char *file, int access, mode_t mode, int *failed_to_lock)
 {
 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 (!deja_vu) {
+        char *dl;

 
 

-       if (cp) {
-           datalocktype = init_locktype(cp);
+        deja_vu = true;
+       if ((dl = context_find("datalocking"))) {
+           datalocktype = init_locktype(dl);

        } else {
            /* We default to fcntl locking for data files */
            datalocktype = FCNTL_LOCKING;
        }
        } else {
            /* We default to fcntl locking for data files */
            datalocktype = FCNTL_LOCKING;
        }

-
-       datalockinit = 1;

     }
 
     return lkopen(file, access, mode, datalocktype, failed_to_lock);
     }
 
     return lkopen(file, access, mode, datalocktype, failed_to_lock);


@@ -138,12 +135,14 @@ lkopendata(const char *file, int access, mode_t mode, int *failed_to_lock)
  * Locking using the spool locking algorithm
  */
 
  * Locking using the spool locking algorithm
  */
 

-int lkopenspool(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);
     }
 
     return lkopen(file, access, mode, spoollocktype, failed_to_lock);


@@ -318,7 +317,7 @@ lkopen (const char *file, int access, mode_t mode, enum locktype ltype,
 #endif /* HAVE_FLOCK */
 
     default:
 #endif /* HAVE_FLOCK */
 
     default:

-       adios(NULL, "Internal locking error: unsupported lock type used!");
+       die("Internal locking error: unsupported lock type used!");

     }
 
     return -1;
     }
 
     return -1;


@@ -526,6 +525,7 @@ lkopen_dot (const char *file, int access, mode_t mode, int *failed_to_lock)
             lockname (file, &lkinfo, 1);
        }
 
             lockname (file, &lkinfo, 1);
        }
 

+        close(fd);

         *failed_to_lock = 1;
         return -1;
     }
         *failed_to_lock = 1;
         return -1;
     }


@@ -579,7 +579,7 @@ lockit (struct lockinfo *li)
     fd = link(tmpfile, curlock);
     (void) m_unlink(tmpfile);
 
     fd = link(tmpfile, curlock);
     (void) m_unlink(tmpfile);
 

-    return (fd == -1 ? -1 : 0);
+    return fd == -1 ? -1 : 0;

 }
 #endif /* HAVE_LIBLOCKFILE */
 
 }
 #endif /* HAVE_LIBLOCKFILE */
 


@@ -632,7 +632,9 @@ lockname (const char *file, struct lockinfo *li, int isnewlock)
 
     snprintf (bp, sizeof(li->curlock) - bplen, "%s.lock", cp);
 
 
     snprintf (bp, sizeof(li->curlock) - bplen, "%s.lock", cp);
 

-#if !defined(HAVE_LIBLOCKFILE)
+#if defined(HAVE_LIBLOCKFILE)
+    NMH_UNUSED(isnewlock);
+#else

     /*
      * If this is for a new lock, create a name for
      * the temporary lock file for lockit()
     /*
      * If this is for a new lock, create a name for
      * the temporary lock file for lockit()


@@ -751,20 +753,20 @@ init_locktype(const char *lockname)
 #ifdef HAVE_LOCKF
        return LOCKF_LOCKING;
 #else /* ! HAVE_LOCKF */
 #ifdef HAVE_LOCKF
        return LOCKF_LOCKING;
 #else /* ! HAVE_LOCKF */

-       adios(NULL, "lockf not supported on this system");
+       die("lockf not supported on this system");

 #endif /* HAVE_LOCKF */
     }
     if (strcasecmp(lockname, "flock") == 0) {
 #ifdef HAVE_FLOCK
        return FLOCK_LOCKING;
 #else /* ! HAVE_FLOCK */
 #endif /* HAVE_LOCKF */
     }
     if (strcasecmp(lockname, "flock") == 0) {
 #ifdef HAVE_FLOCK
        return FLOCK_LOCKING;
 #else /* ! HAVE_FLOCK */

-       adios(NULL, "flock not supported on this system");
+       die("flock not supported on this system");

 #endif /* HAVE_FLOCK */
     }
     if (strcasecmp(lockname, "dot") == 0) {
        return DOT_LOCKING;
     }
 #endif /* HAVE_FLOCK */
     }
     if (strcasecmp(lockname, "dot") == 0) {
        return DOT_LOCKING;
     }

-    adios(NULL, "Unknown lock type: \"%s\"", lockname);
+    die("Unknown lock type: \"%s\"", lockname);

     /* NOTREACHED */
     return 0;
 }
     /* NOTREACHED */
     return 0;
 }