X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=sbr%2Flock_file.c;h=11531dfbfc3dee2936583e27a68e3c3ae3b07d96;hb=fc71710f8695ea07d852284286b058ecb3955317;hp=e065c93e4657bdd677337bd9311a014cd42f3928;hpb=9f9bfa91d88b3ca4cd9206c1f2b17c6d13ebcaba;p=mmh

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index e065c93..11531df 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -30,9 +30,7 @@
 # endif
 #endif
 
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -106,12 +104,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 +435,8 @@ 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)
-		return -1;
-#endif
 
 #if 0
 	/* write our process id into lock file */
@@ -585,7 +573,7 @@ timerOFF(int fd)
 ** lockfiles, so another command doesn't remove them.
 */
 
-static RETSIGTYPE
+static void
 alrmser(int sig)
 {
 	char *lockfile;