projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Remove sbr/strerror.c -- strerror(3) is defined in C89.
[mmh]
/
sbr
/
lock_file.c
diff --git
a/sbr/lock_file.c
b/sbr/lock_file.c
index
5cd1872
..
a98d5b1
100644
(file)
--- a/
sbr/lock_file.c
+++ b/
sbr/lock_file.c
@@
-19,6
+19,7
@@
#include <h/mh.h>
#include <h/signals.h>
#include <h/mh.h>
#include <h/signals.h>
+#include <h/utils.h>
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
@@
-56,8
+57,6
@@
#include <lockfile.h>
#endif
#include <lockfile.h>
#endif
-extern int errno;
-
#ifdef LOCKDIR
char *lockdir = LOCKDIR;
#endif
#ifdef LOCKDIR
char *lockdir = LOCKDIR;
#endif
@@
-342,7
+341,6
@@
lkopen_kernel (char *file, int access, mode_t mode)
j = errno;
close (fd);
j = errno;
close (fd);
- admonish (file, "lock did not succeed, waiting");
sleep (5);
}
sleep (5);
}
@@
-404,6
+402,7
@@
lkopen_dot (char *file, int access, mode_t mode)
else
sleep (5);
}
else
sleep (5);
}
+ lockname (file, &lkinfo, 1);
}
}
#else
}
}
#else
@@
-544,15
+543,11
@@
timerON (char *curlock, int fd)
struct lock *lp;
size_t len;
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;
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;
memcpy (lp->l_lock, curlock, len);
lp->l_next = l_top;