diff options
| -rw-r--r-- | util/ChangeLog | 9 | ||||
| -rw-r--r-- | util/dotlock.c | 60 | ||||
| -rw-r--r-- | util/iobuf.c | 2 |
3 files changed, 59 insertions, 12 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 429144a77..7c79787a2 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,12 @@ +2004-09-30 David Shaw <[email protected]> + + * iobuf.c (pop_filter): Make static. + + * dotlock.c (destroy_dotlock): New. Remove the handle from the + list of locks. + (release_dotlock): Don't act if we don't have any locks at all. + From Werner on stable branch. + 2004-09-10 David Shaw <[email protected]> * http.c (make_radix64_string, do_parse_uri, send_request): Add diff --git a/util/dotlock.c b/util/dotlock.c index 79e45c734..b60e4db75 100644 --- a/util/dotlock.c +++ b/util/dotlock.c @@ -1,5 +1,5 @@ /* dotlock.c - dotfile locking - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -197,6 +197,45 @@ create_dotlock( const char *file_to_lock ) return h; } + +void +destroy_dotlock ( DOTLOCK h ) +{ +#if !defined (HAVE_DOSISH_SYSTEM) + if ( h ) + { + DOTLOCK hprev, htmp; + + /* First remove the handle from our global list of all locks. */ + for (hprev=NULL, htmp=all_lockfiles; htmp; hprev=htmp, htmp=htmp->next) + if (htmp == h) + { + if (hprev) + hprev->next = htmp->next; + else + all_lockfiles = htmp->next; + h->next = NULL; + break; + } + + /* Second destroy the lock. */ + if (!h->disable) + { + if (h->locked && h->lockname) + unlink (h->lockname); + if (h->tname) + unlink (h->tname); + m_free (h->tname); + m_free (h->lockname); + } + m_free(h); + + } +#endif +} + + + static int maybe_deadlock( DOTLOCK h ) { @@ -317,9 +356,15 @@ release_dotlock( DOTLOCK h ) #else int pid; - if( h->disable ) { + /* To avoid atexit race conditions we first check whether there + are any locks left. It might happen that another atexit + handler tries to release the lock while the atexit handler of + this module already ran and thus H is undefined. */ + if(!all_lockfiles) + return 0; + + if( h->disable ) return 0; - } if( !h->locked ) { log_debug("oops, `%s' is not locked\n", h->lockname ); @@ -407,14 +452,7 @@ remove_lockfiles() while( h ) { h2 = h->next; - if( !h->disable ) { - if( h->locked ) - unlink( h->lockname ); - unlink(h->tname); - m_free(h->tname); - m_free(h->lockname); - } - m_free(h); + destroy_dotlock (h); h = h2; } #endif diff --git a/util/iobuf.c b/util/iobuf.c index b00188bcf..1a97e564f 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -1354,7 +1354,7 @@ iobuf_push_filter2( IOBUF a, /**************** * Remove an i/o filter. */ -int +static int pop_filter( IOBUF a, int (*f)(void *opaque, int control, IOBUF chain, byte *buf, size_t *len), void *ov ) { |