X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Flock_file.c;h=83cf01a25324390e9e1a6a4a25f633051d0aeeee;hb=6bd76adcc81f4a725352c338a39212bcdefb0a4b;hp=7eaa0de30e01e8d5cc0c053d8bcdfee1ff333381;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 7eaa0de..83cf01a 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -29,10 +29,7 @@
 #  include <time.h>
 # endif
 #endif
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -107,11 +104,11 @@ static void lockname (char *, struct lockinfo *, int);
 static void timerON (char *, int);
 static void timerOFF (int);
 static RETSIGTYPE alrmser (int);
-#endif
 
 #if !defined(HAVE_LIBLOCKFILE)
 static int lockit (struct lockinfo *);
 #endif
+#endif
 
 /*
  * Base routine to open and lock a file,
@@ -434,18 +431,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 */