Use HAVE_UNISTD_H when including unistd.h.

[idzebra-moved-to-github.git] / index / lockutil.c

diff --git a/index/lockutil.c b/index/lockutil.c
index cbfbb97..4c7cbf7 100644 (file)
--- 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.15 2002-04-04 14:14:13 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 <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -14,7 +30,8 @@
 #ifdef WIN32
 #include <io.h>
 #include <sys/locking.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
@@ -76,12 +93,12 @@ ZebraLockHandle zebra_lock_create (const char *dir,
            (O_BINARY|O_CREAT|O_RDWR), 0666);
 #else
     h->fd= open (fname, ((h->excl_flag > 1) ? O_EXCL : 0)|
-           (O_BINARY|O_CREAT|O_RDWR|O_SYNC), 0666);
+           (O_BINARY|O_CREAT|O_RDWR), 0666);
 #endif
     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] != '/')