X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=87c644756c753017499f5e9111ea0dd1bfeff907;hb=6acd2e140d59433a002f2f1890cb4a6e25895c68;hp=347a2a3ec08a62f710fb0c7609d8df9d56bb617c;hpb=49d0ee122a9f86ec2967b577dcc297c501785edd;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index 347a2a3..87c6447 100644
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -1,4 +1,4 @@
-/* $Id: bfile.c,v 1.41 2005-04-15 10:47:47 adam Exp $
+/* $Id: bfile.c,v 1.45 2005-09-19 09:37:31 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -26,7 +26,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #ifdef WIN32
 #include <io.h>
-#else
+#endif
+
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
@@ -99,11 +101,11 @@ static void unlink_cache (BFiles bfs)
     unlink (bfs->cache_fname);
 }
 
-void bf_cache (BFiles bfs, const char *spec)
+ZEBRA_RES bf_cache (BFiles bfs, const char *spec)
 {
     if (spec)
     {
-        yaz_log (YLOG_LOG, "enabling cache spec=%s", spec);
+        yaz_log (YLOG_LOG, "enabling shadow spec=%s", spec);
         if (!bfs->commit_area)
 	    bfs->commit_area = mf_init ("shadow", spec, bfs->base);
         if (bfs->commit_area)
@@ -114,9 +116,15 @@ void bf_cache (BFiles bfs, const char *spec)
             strcat (bfs->cache_fname, "/cache");
             yaz_log (YLOG_LOG, "cache_fname = %s", bfs->cache_fname);
         }
+	else
+	{
+	    yaz_log(YLOG_WARN, "shadow could not be enabled");
+	    return ZEBRA_FAIL;
+	}
     }
     else
         bfs->commit_area = NULL;
+    return ZEBRA_OK;
 }
 
 int bf_close (BFile bf)
@@ -147,7 +155,7 @@ BFile bf_xopen(BFiles bfs, const char *name, int block_size, int wrflag,
     if (!bf)
 	return 0;
      /* HEADER_SIZE is considered enough for our header */
-    if (bf->alloc_buf_size < HEADER_SIZE)
+    if (bf->block_size < HEADER_SIZE)
 	bf->alloc_buf_size = HEADER_SIZE;
     else
 	bf->alloc_buf_size = bf->block_size;
@@ -203,6 +211,8 @@ BFile bf_xopen(BFiles bfs, const char *name, int block_size, int wrflag,
 	bf_close(bf);
 	return 0;
     }
+    if (hbuf[l] == ' ')
+	l++;
     if (more_info)
 	*more_info = hbuf + l;
     return bf;
@@ -212,8 +222,8 @@ int bf_xclose (BFile bf, int version, const char *more_info)
 {
     if (bf->header_dirty)
     {
-	assert(bf->alloc_buf);
 	zint pos = 0;
+	assert(bf->alloc_buf);
 	assert(bf->magic);
 	sprintf(bf->alloc_buf, "%s %d " ZINT_FORMAT " " ZINT_FORMAT " ", 
 		bf->magic, version, bf->last_block, bf->free_list);