More work on SDRKit integration.

[idzebra-moved-to-github.git] / bfile / bfile.c

diff --git a/bfile/bfile.c b/bfile/bfile.c
index 06bca15..6700679 100644 (file)
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: bfile.c,v $
- * Revision 1.23  1997-09-17 12:19:06  adam
+ * Revision 1.27  1999-02-02 14:50:01  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.26  1998/02/17 10:32:52  adam
+ * Fixed bug: binary files weren't opened with flag b on NT.
+ *
+ * Revision 1.25  1997/10/27 14:25:38  adam
+ * Fixed memory leaks.
+ *
+ * Revision 1.24  1997/09/18 08:59:16  adam
+ * Extra generic handle for the character mapping routines.
+ *
+ * Revision 1.23  1997/09/17 12:19:06  adam
  * Zebra version corresponds to YAZ version 1.4.
  * Changed Zebra server so that it doesn't depend on global common_resource.
  *
@@ -79,7 +91,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -106,6 +118,9 @@ BFiles bfs_create (const char *spec)
 
 void bfs_destroy (BFiles bfs)
 {
+    xfree (bfs->lockDir);
+    mf_destroy (bfs->commit_area);
+    mf_destroy (bfs->register_area);
     xfree (bfs);
 }
 
@@ -179,7 +194,7 @@ BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag)
         {
             FILE *outf;
 
-            outf = open_cache (bfs, "a");
+            outf = open_cache (bfs, "ab");
             if (!outf)
             {
                 logf (LOG_FATAL|LOG_ERRNO, "open %scache",
@@ -224,7 +239,7 @@ int bf_commitExists (BFiles bfs)
 {
     FILE *inf;
 
-    inf = open_cache (bfs, "r");
+    inf = open_cache (bfs, "rb");
     if (inf)
     {
         fclose (inf);
@@ -243,7 +258,7 @@ void bf_commitExec (BFiles bfs)
     int first_time;
 
     assert (bfs->commit_area);
-    if (!(inf = open_cache (bfs, "r")))
+    if (!(inf = open_cache (bfs, "rb")))
     {
         logf (LOG_LOG, "No commit file");
         return ;
@@ -277,7 +292,7 @@ void bf_commitClean (BFiles bfs, const char *spec)
         mustDisable = 1;
     }
 
-    if (!(inf = open_cache (bfs, "r")))
+    if (!(inf = open_cache (bfs, "rb")))
         return ;
     while (fscanf (inf, "%s %d", path, &block_size) == 2)
     {