* lock.c -- routines to lock/unlock files
*
* $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh. See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
*/
+/* Modified by Ruud de Rooij to support Miquel van Smoorenburg's liblockfile
+ *
+ * Since liblockfile locking shares most of its code with dot locking, it
+ * is enabled by defining both DOT_LOCKING and HAVE_LIBLOCKFILE.
+ *
+ * Ruud de Rooij <ruud@debian.org> Sun, 28 Mar 1999 15:34:03 +0200
+ */
+
#include <h/mh.h>
#include <h/signals.h>
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef TM_IN_SYS_TIME
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#ifdef HAVE_ERRNO_H
# include <errno.h>
#endif
#include <signal.h>
+#if defined(HAVE_LIBLOCKFILE)
+#include <lockfile.h>
+#endif
+
extern int errno;
#ifdef LOCKDIR
/* struct for getting name of lock file to create */
struct lockinfo {
char curlock[BUFSIZ];
+#if !defined(HAVE_LIBLOCKFILE)
char tmplock[BUFSIZ];
+#endif
};
/*
*/
#define NSECS 20
+#if !defined(HAVE_LIBLOCKFILE)
/*
* How old does a lock file need to be
* before we remove it.
*/
#define RSECS 180
+#endif /* HAVE_LIBLOCKFILE */
/* struct for recording and updating locks */
struct lock {
#ifdef DOT_LOCKING
lockname (file, &lkinfo, 0); /* get name of lock file */
+#if !defined(HAVE_LIBLOCKFILE)
unlink (lkinfo.curlock); /* remove lock file */
+#else
+ lockfile_remove(lkinfo.curlock);
+#endif /* HAVE_LIBLOCKFILE */
timerOFF (fd); /* turn off lock timer */
-#endif
+#endif /* DOT_LOCKING */
return (close (fd));
}
#ifdef DOT_LOCKING
lockname (file, &lkinfo, 0); /* get name of lock file */
+#if !defined(HAVE_LIBLOCKFILE)
unlink (lkinfo.curlock); /* remove lock file */
+#else
+ lockfile_remove(lkinfo.curlock);
+#endif /* HAVE_LIBLOCKFILE */
timerOFF (fileno(fp)); /* turn off lock timer */
-#endif
+#endif /* DOT_LOCKING */
return (fclose (fp));
}
*/
lockname (file, &lkinfo, 1);
+#if !defined(HAVE_LIBLOCKFILE)
for (i = 0;;) {
/* attempt to create lock file */
if (lockit (&lkinfo) == 0) {
}
}
}
+#else
+ if (lockfile_create(lkinfo.curlock, 5, 0) == L_SUCCESS) {
+ timerON(lkinfo.curlock, fd);
+ return fd;
+ }
+ else {
+ close(fd);
+ return -1;
+ }
+#endif /* HAVE_LIBLOCKFILE */
}
+#if !defined(HAVE_LIBLOCKFILE)
/*
* Routine that actually tries to create
* the lock file.
curlock = li->curlock;
tmplock = li->tmplock;
+#ifdef HAVE_MKSTEMP
+ if ((fd = mkstemp(tmplock)) == -1)
+ return -1;
+#else
+ if (mktemp(tmplock) == NULL)
+ return -1;
+ if (unlink(tmplock) == -1 && errno != ENOENT)
+ return -1;
/* create the temporary lock file */
if ((fd = creat(tmplock, 0600)) == -1)
return -1;
+#endif
#if 0
/* write our process id into lock file */
return (fd == -1 ? -1 : 0);
}
+#endif /* HAVE_LIBLOCKFILE */
/*
* Get name of lock file, and temporary lock file
snprintf (bp, sizeof(li->curlock) - bplen, "%s.lock", cp);
+#if !defined(HAVE_LIBLOCKFILE)
/*
* If this is for a new lock, create a name for
* the temporary lock file for lockit()
else
snprintf (li->tmplock, sizeof(li->tmplock), "%.*s,LCK.XXXXXX",
cp - li->curlock, li->curlock);
-/*
- Mkstemp work postponed until later -Doug
-#ifdef HAVE_MKSTEMP
- mkstemp (li->tmplock);
-#else
-*/
- mktemp (li->tmplock);
-/*
-#endif
-*/
-
- unlink (li->tmplock); /* remove any stray */
}
+#endif
}
/* update the ctime of all the lock files */
for (lp = l_top; lp; lp = lp->l_next) {
lockfile = lp->l_lock;
+#if !defined(HAVE_LIBLOCKFILE)
if (*lockfile && (j = creat (lockfile, 0600)) != -1)
close (j);
+#else
+ lockfile_touch(lockfile);
+#endif
}
/* restart the alarm */