X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Flock_file.c;h=bbfc8fc7cf4249089f4c0ae4c44dcc89d9c9cdb1;hb=7428828caf071831ea3caf1efb856c418929acc2;hp=ec887374e279d5131f582575955d4310ff3d2ba3;hpb=3a162432aa58eff6e48f99afaf746408905b008c;p=mmh diff --git a/sbr/lock_file.c b/sbr/lock_file.c index ec88737..bbfc8fc 100644 --- a/sbr/lock_file.c +++ b/sbr/lock_file.c @@ -2,7 +2,9 @@ /* * lock.c -- routines to lock/unlock files * - * $Id$ + * This code is Copyright (c) 2002, by the authors of nmh. See the + * COPYRIGHT file in the root directory of the nmh distribution for + * complete copyright information. */ /* Modified by Ruud de Rooij to support Miquel van Smoorenburg's liblockfile @@ -15,26 +17,13 @@ #include #include +#include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif -#endif - -#ifdef HAVE_ERRNO_H -# include #endif - -#ifdef MMDFONLY -# include -# include -#endif /* MMDFONLY */ +#include +#include #ifdef HAVE_FCNTL_H # include @@ -52,8 +41,6 @@ #include #endif -extern int errno; - #ifdef LOCKDIR char *lockdir = LOCKDIR; #endif @@ -107,13 +94,15 @@ static int lkopen_kernel (char *, int, mode_t); #ifdef DOT_LOCKING static int lkopen_dot (char *, int, mode_t); -static int lockit (struct lockinfo *); 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 +#endif /* * Base routine to open and lock a file, @@ -178,6 +167,8 @@ lkclose (int fd, char *file) lockfile_remove(lkinfo.curlock); #endif /* HAVE_LIBLOCKFILE */ timerOFF (fd); /* turn off lock timer */ +#else /* DOT_LOCKING */ + NMH_UNUSED (file); #endif /* DOT_LOCKING */ return (close (fd)); @@ -197,10 +188,22 @@ lkfopen (char *file, char *mode) if (strcmp (mode, "r") == 0) access = O_RDONLY; - else + else if (strcmp (mode, "r+") == 0) access = O_RDWR; + else if (strcmp (mode, "w") == 0) + access = O_WRONLY | O_CREAT | O_TRUNC; + else if (strcmp (mode, "w+") == 0) + access = O_RDWR | O_CREAT | O_TRUNC; + else if (strcmp (mode, "a") == 0) + access = O_WRONLY | O_CREAT | O_APPEND; + else if (strcmp (mode, "a+") == 0) + access = O_RDWR | O_CREAT | O_APPEND; + else { + errno = EINVAL; + return NULL; + } - if ((fd = lkopen (file, access, 0)) == -1) + if ((fd = lkopen (file, access, 0666)) == -1) return NULL; if ((fp = fdopen (fd, mode)) == NULL) { @@ -257,6 +260,8 @@ lkfclose (FILE *fp, char *file) lockfile_remove(lkinfo.curlock); #endif /* HAVE_LIBLOCKFILE */ timerOFF (fileno(fp)); /* turn off lock timer */ +#else /* DOT_LOCKING */ + NMH_UNUSED (file); #endif /* DOT_LOCKING */ return (fclose (fp)); @@ -310,7 +315,8 @@ lkopen_kernel (char *file, int access, mode_t mode) # endif # ifdef FLOCK_LOCKING - if (flock (fd, LOCK_EX | LOCK_NB) != -1) + if (flock (fd, (((access & 03) == O_RDONLY) ? LOCK_SH : LOCK_EX) + | LOCK_NB) != -1) return fd; # endif @@ -345,10 +351,8 @@ lkopen_kernel (char *file, int access, mode_t mode) static int lkopen_dot (char *file, int access, mode_t mode) { - int i, fd; - time_t curtime; + int fd; struct lockinfo lkinfo; - struct stat st; /* open the file */ if ((fd = open (file, access, mode)) == -1) @@ -361,30 +365,36 @@ lkopen_dot (char *file, int access, mode_t mode) lockname (file, &lkinfo, 1); #if !defined(HAVE_LIBLOCKFILE) - for (i = 0;;) { - /* attempt to create lock file */ - if (lockit (&lkinfo) == 0) { - /* if successful, turn on timer and return */ - timerON (lkinfo.curlock, fd); - return fd; - } else { - /* - * Abort locking, if we fail to lock after 5 attempts - * and are never able to stat the lock file. - */ - if (stat (lkinfo.curlock, &st) == -1) { - if (i++ > 5) - return -1; - sleep (5); + { + int i; + for (i = 0;;) { + /* attempt to create lock file */ + if (lockit (&lkinfo) == 0) { + /* if successful, turn on timer and return */ + timerON (lkinfo.curlock, fd); + return fd; } else { - i = 0; - time (&curtime); - - /* check for stale lockfile, else sleep */ - if (curtime > st.st_ctime + RSECS) - unlink (lkinfo.curlock); - else + /* + * Abort locking, if we fail to lock after 5 attempts + * and are never able to stat the lock file. + */ + struct stat st; + if (stat (lkinfo.curlock, &st) == -1) { + if (i++ > 5) + return -1; sleep (5); + } else { + time_t curtime; + i = 0; + time (&curtime); + + /* check for stale lockfile, else sleep */ + if (curtime > st.st_ctime + RSECS) + unlink (lkinfo.curlock); + else + sleep (5); + } + lockname (file, &lkinfo, 1); } } } @@ -419,8 +429,7 @@ lockit (struct lockinfo *li) curlock = li->curlock; tmplock = li->tmplock; - /* create the temporary lock file */ - if ((fd = creat(tmplock, 0600)) == -1) + if ((fd = mkstemp(tmplock)) == -1) return -1; #if 0 @@ -468,7 +477,7 @@ lockname (char *file, struct lockinfo *li, int isnewlock) bplen += tmplen; #else if (cp != file) { - snprintf (bp, sizeof(li->curlock), "%.*s", cp - file, file); + snprintf (bp, sizeof(li->curlock), "%.*s", (int)(cp - file), file); tmplen = strlen (bp); bp += tmplen; bplen += tmplen; @@ -500,19 +509,7 @@ lockname (char *file, struct lockinfo *li, int isnewlock) strncpy (li->tmplock, ",LCK.XXXXXX", sizeof(li->tmplock)); else snprintf (li->tmplock, sizeof(li->tmplock), "%.*s,LCK.XXXXXX", - cp - li->curlock, li->curlock); -/* - Mkstemp work postponed until later -Doug -#ifdef HAVE_MKSTEMP - mkstemp (li->tmplock); -#else -*/ - mktemp (li->tmplock); -/* -#endif -*/ - - unlink (li->tmplock); /* remove any stray */ + (int)(cp - li->curlock), li->curlock); } #endif } @@ -529,15 +526,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; @@ -590,23 +583,22 @@ timerOFF (int fd) * lockfiles, so another command doesn't remove them. */ -static RETSIGTYPE +static void alrmser (int sig) { - int j; char *lockfile; struct lock *lp; - -#ifndef RELIABLE_SIGNALS - SIGNAL (SIGALRM, alrmser); -#endif + NMH_UNUSED (sig); /* update the ctime of all the lock files */ for (lp = l_top; lp; lp = lp->l_next) { lockfile = lp->l_lock; #if !defined(HAVE_LIBLOCKFILE) - if (*lockfile && (j = creat (lockfile, 0600)) != -1) - close (j); + { + int j; + if (*lockfile && (j = creat (lockfile, 0600)) != -1) + close (j); + } #else lockfile_touch(lockfile); #endif