X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Flock_file.c;h=b1879b380b033a4932e2d8a4db229a91d4eff241;hp=34d743e5414bbf475a2ea081c41176cef7f17897;hb=4e4c5eeaffc0ff9e341c1562a02c1749a9a06dbe;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 34d743e..b1879b3 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -19,20 +19,12 @@
 #include <h/signals.h>
 #include <h/utils.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,12 +98,12 @@ 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);
-#endif
+static void alrmser(int);
 
 #if !defined(HAVE_LIBLOCKFILE)
 static int lockit(struct lockinfo *);
 #endif
+#endif
 
 /*
 ** Base routine to open and lock a file,
@@ -437,18 +429,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)
-		return -1;
-	/* create the temporary lock file */
-	if ((fd = creat(tmplock, 0600)) == -1)
+	if ((fd = mkstemp(tmplock)) == -1) {
+		advise(NULL, "unable to create temporary file in %s", tmplock);
 		return -1;
-#endif
+	}
 
 #if 0
 	/* write our process id into lock file */
@@ -479,10 +463,6 @@ lockname(char *file, struct lockinfo *li, int isnewlock)
 	int bplen, tmplen;
 	char *bp, *cp;
 
-#if 0
-	struct stat st;
-#endif
-
 	if ((cp = strrchr(file, '/')) == NULL || *++cp == 0)
 		cp = file;
 
@@ -502,19 +482,6 @@ lockname(char *file, struct lockinfo *li, int isnewlock)
 	}
 #endif
 
-#if 0
-	/*
-	** mmdf style dot locking.  Currently not supported.
-	** If we start supporting mmdf style dot locking,
-	** we will need to change the return value of lockname
-	*/
-	if (stat(file, &st) == -1)
-		return -1;
-
-	snprintf(bp, sizeof(li->curlock) - bplen, "LCK%05d.%05d",
-		st.st_dev, st.st_ino);
-#endif
-
 	snprintf(bp, sizeof(li->curlock) - bplen, "%s.lock", cp);
 
 #if !defined(HAVE_LIBLOCKFILE)
@@ -602,16 +569,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;