X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Flock_file.c;h=bbfc8fc7cf4249089f4c0ae4c44dcc89d9c9cdb1;hb=884c2f0375bc6108a9902bf0971844d34585c418;hp=51576ea8baf1a7624e872dbf3bfa6bd7b63acb62;hpb=988cf5d51958127d579f97a0d4632930a25ee11e;p=mmh

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 51576ea..bbfc8fc 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -19,20 +19,11 @@
 #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
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
 #endif
+#include <time.h>
+#include <errno.h>
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -106,7 +97,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 *);
@@ -176,6 +167,8 @@ lkclose (int fd, char *file)
     lockfile_remove(lkinfo.curlock);
 #endif /* HAVE_LIBLOCKFILE */
     timerOFF (fd);			/* turn off lock timer   */
+#else  /* DOT_LOCKING */
+    NMH_UNUSED (file);
 #endif /* DOT_LOCKING */
 
     return (close (fd));
@@ -267,6 +260,8 @@ lkfclose (FILE *fp, char *file)
     lockfile_remove(lkinfo.curlock);
 #endif /* HAVE_LIBLOCKFILE */
     timerOFF (fileno(fp));		/* turn off lock timer   */
+#else  /* DOT_LOCKING */
+    NMH_UNUSED (file);
 #endif /* DOT_LOCKING */
 
     return (fclose (fp));
@@ -434,18 +429,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 */
@@ -598,15 +583,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
+    NMH_UNUSED (sig);
 
     /* update the ctime of all the lock files */
     for (lp = l_top; lp; lp = lp->l_next) {