projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't require a length for switch prefixes without good reason.
[mmh]
/
sbr
/
lock_file.c
diff --git
a/sbr/lock_file.c
b/sbr/lock_file.c
index
e065c93
..
d15c939
100644
(file)
--- a/
sbr/lock_file.c
+++ b/
sbr/lock_file.c
@@
-19,20
+19,12
@@
#include <h/signals.h>
#include <h/utils.h>
#include <h/signals.h>
#include <h/utils.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <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
#endif
+#include <time.h>
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
@@
-106,12
+98,12
@@
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 void lockname(char *, struct lockinfo *, int);
static void timerON(char *, int);
static void timerOFF(int);
-static RETSIGTYPE alrmser(int);
-#endif
+static void alrmser(int);
#if !defined(HAVE_LIBLOCKFILE)
static int lockit(struct lockinfo *);
#endif
#if !defined(HAVE_LIBLOCKFILE)
static int lockit(struct lockinfo *);
#endif
+#endif
/*
** Base routine to open and lock a file,
/*
** Base routine to open and lock a file,
@@
-437,18
+429,8
@@
lockit(struct lockinfo *li)
curlock = li->curlock;
tmplock = li->tmplock;
curlock = li->curlock;
tmplock = li->tmplock;
-#ifdef HAVE_MKSTEMP
if ((fd = mkstemp(tmplock)) == -1)
return -1;
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 */
#if 0
/* write our process id into lock file */
@@
-585,16
+567,12
@@
timerOFF(int fd)
** lockfiles, so another command doesn't remove them.
*/
** lockfiles, so another command doesn't remove them.
*/
-static RETSIGTYPE
+static void
alrmser(int sig)
{
char *lockfile;
struct lock *lp;
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;
/* update the ctime of all the lock files */
for (lp = l_top; lp; lp = lp->l_next) {
lockfile = lp->l_lock;