-/*
- * Copyright (C) 1994-1997, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: lockutil.c,v $
- * Revision 1.10 1997-09-29 09:08:36 adam
- * Revised locking system to be thread safe for the server.
- *
- * Revision 1.9 1997/09/25 14:54:43 adam
- * WIN32 files lock support.
- *
- * Revision 1.8 1997/09/17 12:19:15 adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.7 1997/09/09 13:38:08 adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.6 1996/10/29 14:08:14 adam
- * Uses resource lockDir instead of lockPath.
- *
- * Revision 1.5 1996/03/26 16:01:13 adam
- * New setting lockPath: directory of various lock files.
- *
- * Revision 1.4 1995/12/13 08:46:10 adam
- * Locking uses F_WRLCK and F_RDLCK again!
- *
- * Revision 1.3 1995/12/12 16:00:57 adam
- * System call sync(2) used after update/commit.
- * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
- * and F_RDLCK.
- *
- * Revision 1.2 1995/12/11 11:43:29 adam
- * Locking based on fcntl instead of flock.
- * Setting commitEnable removed. Command line option -n can be used to
- * prevent commit if commit setting is defined in the configuration file.
- *
- * Revision 1.1 1995/12/07 17:38:47 adam
- * Work locking mechanisms for concurrent updates/commit.
- *
- */
+/* $Id: lockutil.c,v 1.17 2002-08-02 19:26:55 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ 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 <stdio.h>
#include <assert.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#include <sys/locking.h>
#else
int excl_flag;
};
-ZebraLockHandle zebra_lock_create (const char *name, int excl_flag)
+char *zebra_mk_fname (const char *dir, const char *name)
+{
+ int dlen = dir ? strlen(dir) : 0;
+ char *fname = xmalloc (dlen + strlen(name) + 3);
+
+#ifdef WIN32
+ if (dlen)
+ {
+ int last_one = dir[dlen-1];
+
+ if (!strchr ("/\\:", last_one))
+ sprintf (fname, "%s\\%s", dir, name);
+ else
+ sprintf (fname, "%s%s", dir, name);
+ }
+ else
+ sprintf (fname, "%s", name);
+#else
+ if (dlen)
+ {
+ int last_one = dir[dlen-1];
+
+ if (!strchr ("/", last_one))
+ sprintf (fname, "%s/%s", dir, name);
+ else
+ sprintf (fname, "%s%s", dir, name);
+ }
+ else
+ sprintf (fname, "%s", name);
+#endif
+ return fname;
+}
+
+ZebraLockHandle zebra_lock_create (const char *dir,
+ const char *name, int excl_flag)
{
- ZebraLockHandle h = xmalloc (sizeof(*h));
+ char *fname = zebra_mk_fname(dir, name);
+ ZebraLockHandle h = (ZebraLockHandle) xmalloc (sizeof(*h));
+
h->excl_flag = excl_flag;
h->fd = -1;
-#ifdef WINDOWS
+
+
+#ifdef WIN32
if (!h->excl_flag)
h->fd = open (name, O_BINARY|O_RDONLY);
if (h->fd == -1)
- h->fd = open (name, ((h->excl_flag > 1) ? O_EXCL : 0)|
+ h->fd = open (fname, ((h->excl_flag > 1) ? O_EXCL : 0)|
(O_BINARY|O_CREAT|O_RDWR), 0666);
#else
- h->fd= open (name, ((h->excl_flag > 1) ? O_EXCL : 0)|
- (O_BINARY|O_CREAT|O_RDWR|O_SYNC), 0666);
+ h->fd= open (fname, ((h->excl_flag > 1) ? O_EXCL : 0)|
+ (O_BINARY|O_CREAT|O_RDWR), 0666);
#endif
if (h->fd == -1)
{
if (h->excl_flag <= 1)
- logf (LOG_WARN|LOG_ERRNO, "open %s", name);
+ logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
xfree (h);
- return NULL;
+ h = 0;
}
+ xfree (fname);
return h;
}
strcat (path, "/");
}
-#ifdef WINDOWS
-
-#else
+#ifndef WIN32
static int unixLock (int fd, int type, int cmd)
{
struct flock area;
}
#endif
+int zebra_lock_w (ZebraLockHandle h)
+{
+#ifdef WIN32
+ return _locking (h->fd, _LK_LOCK, 1);
+#else
+ return unixLock (h->fd, F_WRLCK, F_SETLKW);
+#endif
+}
+
+int zebra_lock_r (ZebraLockHandle h)
+{
+#ifdef WIN32
+ return _locking (h->fd, _LK_LOCK, 1);
+#else
+ return unixLock (h->fd, F_RDLCK, F_SETLKW);
+#endif
+}
+
int zebra_lock (ZebraLockHandle h)
{
-#ifdef WINDOWS
+#ifdef WIN32
return _locking (h->fd, _LK_LOCK, 1);
#else
return unixLock (h->fd, h->excl_flag ? F_WRLCK : F_RDLCK, F_SETLKW);
int zebra_lock_nb (ZebraLockHandle h)
{
-#ifdef WINDOWS
+#ifdef WIN32
return _locking (h->fd, _LK_NBLCK, 1);
#else
return unixLock (h->fd, h->excl_flag ? F_WRLCK : F_RDLCK, F_SETLK);
int zebra_unlock (ZebraLockHandle h)
{
-#ifdef WINDOWS
+#ifdef WIN32
return _locking (h->fd, _LK_UNLCK, 1);
#else
return unixLock (h->fd, F_UNLCK, F_SETLKW);