X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Flock_file.c;h=c4353b59a3f2997af857ff413a22fde92253811e;hb=a2469f5ecbca3a179251ac9b777b561bc5245d4c;hp=0e14e8de665ba05ce5ec41d87a4153a835f9b1cf;hpb=d1b702b1220d45e441b2b9597a8cf58edb51a653;p=mmh

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 0e14e8d..c4353b5 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -103,7 +103,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 *);
@@ -431,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 */
@@ -595,16 +585,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;