X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=26af6846cb55aadaf251ad61f9ec76c39bfbe296;hb=71647c93775e998a0e602c0371c34e1143d131dd;hp=7adf2eb93a0aa2d3af605e60985028fdce4fbe73;hpb=0a92d9b74c7db4b0a48d1d23e2b7a4f2980d0085;p=idzebra-moved-to-github.git diff --git a/index/lockidx.c b/index/lockidx.c index 7adf2eb..26af684 100644 --- a/index/lockidx.c +++ b/index/lockidx.c @@ -4,7 +4,13 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: lockidx.c,v $ - * Revision 1.18 2000-02-24 11:00:07 adam + * Revision 1.20 2000-10-16 20:16:00 adam + * Fixed problem with close of lock file for WIN32. + * + * Revision 1.19 2000/09/05 14:04:05 adam + * Updates for prefix 'yaz_' for YAZ log functions. + * + * Revision 1.18 2000/02/24 11:00:07 adam * Fixed bug: indexer would run forever when lock dir was non-existant. * * Revision 1.17 1999/12/08 15:03:11 adam @@ -172,12 +178,18 @@ void zebraIndexUnlock (void) { char path[1024]; - zebra_lock_destroy (server_lock_main); - server_lock_main = 0; zebra_lock_prefix (common_resource, path); strcat (path, FNAME_MAIN_LOCK); +#ifdef WIN32 + zebra_lock_destroy (server_lock_main); if (unlink (path) && errno != ENOENT) logf (LOG_WARN|LOG_ERRNO, "unlink %s failed", path); +#else + if (unlink (path) && errno != ENOENT) + logf (LOG_WARN|LOG_ERRNO, "unlink %s failed", path); + zebra_lock_destroy (server_lock_main); +#endif + server_lock_main = 0; } int zebraIndexLock (BFiles bfs, int commitNow, const char *rval)