X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=f2c418ccf88ac93533922fe9fa942d3f2a4815a5;hb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;hp=286bd4144578c9a4770f8b9c1df822a894bc9438;hpb=9167923869bcb07faf7e357c883f070be098c66e;p=idzebra-moved-to-github.git

diff --git a/index/lockidx.c b/index/lockidx.c
index 286bd41..f2c418c 100644
--- a/index/lockidx.c
+++ b/index/lockidx.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockidx.c,v $
- * Revision 1.8  1997-02-12 20:39:46  adam
+ * Revision 1.10  1997-09-09 13:38:07  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.9  1997/09/04 13:58:04  adam
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.8  1997/02/12 20:39:46  adam
  * Implemented options -f <n> that limits the log to the first <n>
  * records.
  * Changed some log messages also.
@@ -39,7 +45,11 @@
  */
 #include <stdio.h>
 #include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
@@ -61,7 +71,8 @@ int zebraIndexWait (int commitPhase)
     if (server_lock_cmt == -1)
     {
         sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
-        if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
+        if ((server_lock_cmt = open (path, O_BINARY|O_CREAT|O_RDWR|O_SYNC,
+                                     0666))
             == -1)
         {
             logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
@@ -73,7 +84,8 @@ int zebraIndexWait (int commitPhase)
     if (server_lock_org == -1)
     {
         sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
-        if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
+        if ((server_lock_org = open (path, O_BINARY|O_CREAT|O_RDWR|O_SYNC,
+                                     0666))
             == -1)
         {
             logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
@@ -152,10 +164,10 @@ void zebraIndexLock (int commitNow)
     sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK);
     while (1)
     {
-        lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL, 0666);
+        lock_fd = open (path, O_BINARY|O_CREAT|O_RDWR|O_EXCL, 0666);
         if (lock_fd == -1)
         {
-            lock_fd = open (path, O_RDWR);
+            lock_fd = open (path, O_BINARY|O_RDWR);
             if (lock_fd == -1) 
             {
                 if (errno == ENOENT)