X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Flock_file.c;h=66eab72ca3da9e56461e5145096c688b84fe9fe7;hp=5cd187243acf69cc722e0424e59ccafcd1524d87;hb=389877bae1fe1a9f7259b8979f6a930744d90fab;hpb=82a21b6f3cddf8ab048dcb02c080ea9797c73c5a

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 5cd1872..66eab72 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -19,6 +19,7 @@
  
 #include <h/mh.h>
 #include <h/signals.h>
+#include <h/utils.h>
 
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -35,11 +36,6 @@
 # include <errno.h>
 #endif
 
-#ifdef MMDFONLY
-# include <mmdfonly.h>
-# include <lockonly.h>
-#endif /* MMDFONLY */
-
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #else
@@ -56,8 +52,6 @@
 #include <lockfile.h>
 #endif
 
-extern int errno;
-
 #ifdef LOCKDIR
 char *lockdir = LOCKDIR;
 #endif
@@ -342,7 +336,6 @@ lkopen_kernel (char *file, int access, mode_t mode)
 
 	j = errno;
 	close (fd);
-	admonish (file, "lock did not succeed, waiting");
 	sleep (5);
     }
 
@@ -404,6 +397,7 @@ lkopen_dot (char *file, int access, mode_t mode)
 		else
 		    sleep (5);
 	    }
+	    lockname (file, &lkinfo, 1);
 	}
     }
 #else
@@ -544,15 +538,11 @@ timerON (char *curlock, int fd)
     struct lock *lp;
     size_t len;
 
-    if (!(lp = (struct lock *) malloc (sizeof(*lp))))
-	return;
+    lp = (struct lock *) mh_xmalloc (sizeof(*lp));
 
     len = strlen(curlock) + 1;
     lp->l_fd = fd;
-    if (!(lp->l_lock = malloc (len))) {
-	free ((char *) lp);
-	return;
-    }
+    lp->l_lock = mh_xmalloc (len);
     memcpy (lp->l_lock, curlock, len);
     lp->l_next = l_top;