X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Flock_file.c;h=bdce7bbb563b2ab10342feb0afd766645aa495bf;hp=b4a1547ee713efaa83526fbc9d284fc3ef30dbf7;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hpb=adf591eb56d60000e806e20c42eb1907e2cc6fcd

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index b4a1547..bdce7bb 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -15,24 +15,18 @@
 ** Ruud de Rooij <ruud@debian.org>  Sun, 28 Mar 1999 15:34:03 +0200
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 #include <h/signals.h>
 #include <h/utils.h>
+#include <sys/stat.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -106,7 +100,7 @@ static int lkopen_dot(char *, int, mode_t);
 static void lockname(char *, struct lockinfo *, int);
 static void timerON(char *, int);
 static void timerOFF(int);
-static RETSIGTYPE alrmser(int);
+static void alrmser(int);
 
 #if !defined(HAVE_LIBLOCKFILE)
 static int lockit(struct lockinfo *);
@@ -437,18 +431,10 @@ lockit(struct lockinfo *li)
 	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)
+	if ((fd = mkstemp(tmplock)) == -1) {
+		advise(NULL, "unable to create temporary file in %s", tmplock);
 		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 */
@@ -585,16 +571,12 @@ timerOFF(int fd)
 ** lockfiles, so another command doesn't remove them.
 */
 
-static RETSIGTYPE
+static void
 alrmser(int sig)
 {
 	char *lockfile;
 	struct lock *lp;
 
-#ifndef RELIABLE_SIGNALS
-	SIGNAL(SIGALRM, alrmser);
-#endif
-
 	/* update the ctime of all the lock files */
 	for (lp = l_top; lp; lp = lp->l_next) {
 		lockfile = lp->l_lock;