Fixed the error message in lockit() when it fails to create tmp file.

[mmh] / sbr / lock_file.c

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 11531df..b1879b3 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -19,16 +19,10 @@
 #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>
 
 #include <errno.h>
 
@@ -435,8 +429,10 @@ lockit(struct lockinfo *li)
        curlock = li->curlock;
        tmplock = li->tmplock;
 
-       if ((fd = mkstemp(tmplock)) == -1)
+       if ((fd = mkstemp(tmplock)) == -1) {
+               advise(NULL, "unable to create temporary file in %s", tmplock);
                return -1;
+       }
 
 #if 0
        /* write our process id into lock file */
@@ -579,10 +575,6 @@ 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;