X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockutil.c;h=4c7cbf7848e738c0f3a0f76bb866450d9fa50cd2;hb=9f2cdb515d5ba4c8f0806a3420b73061a8e9cd75;hp=24d4d21719b8770b1ab65021d7506a4578dca3fa;hpb=c7301c95631413019060f344ccffdb4f943f8a57;p=idzebra-moved-to-github.git diff --git a/index/lockutil.c b/index/lockutil.c index 24d4d21..4c7cbf7 100644 --- a/index/lockutil.c +++ b/index/lockutil.c @@ -1,10 +1,26 @@ -/* - * Copyright (C) 1994-2002, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Id: lockutil.c,v 1.16 2002-06-02 19:28:53 adam Exp $ - */ +/* $Id: lockutil.c,v 1.21 2005-06-14 20:28:54 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include #include @@ -14,7 +30,8 @@ #ifdef WIN32 #include #include -#else +#endif +#if HAVE_UNISTD_H #include #endif @@ -81,7 +98,7 @@ ZebraLockHandle zebra_lock_create (const char *dir, if (h->fd == -1) { if (h->excl_flag <= 1) - logf (LOG_WARN|LOG_ERRNO, "open %s", fname); + yaz_log (YLOG_WARN|YLOG_ERRNO, "open %s", fname); xfree (h); h = 0; } @@ -100,7 +117,7 @@ void zebra_lock_destroy (ZebraLockHandle h) void zebra_lock_prefix (Res res, char *path) { - char *lock_dir = res_get_def (res, "lockDir", ""); + const char *lock_dir = res_get_def (res, "lockDir", ""); strcpy (path, lock_dir); if (*path && path[strlen(path)-1] != '/')