X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=7b6580952d63a3eaa7e15db1628fb3c1181d3ab5;hb=b9ac6469056f0a8ff7336dbd0b91c2a679329ca3;hp=983929cfafde629375ed3eaa19e1f2d426be97ab;hpb=461e9d67822f7f6ae72a0522cb6e9960dedae501;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index 983929c..7b65809 100644
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -4,37 +4,72 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: bfile.c,v $
- * Revision 1.1  1994-08-17 13:55:08  quinn
- * Deleted
+ * Revision 1.11  1995-09-04 12:33:21  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.10  1994/08/25  10:15:54  quinn
+ * Trivial
+ *
+ * Revision 1.9  1994/08/24  08:45:48  quinn
+ * Using mfile.
+ *
+ * Revision 1.8  1994/08/23  15:03:34  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.7  1994/08/23  14:25:45  quinn
+ * Added O_CREAT because some geek wanted it. Sheesh.
+ *
+ * Revision 1.6  1994/08/23  14:21:38  quinn
+ * Fixed call to log
+ *
+ * Revision 1.5  1994/08/18  08:10:08  quinn
+ * Minimal changes
+ *
+ * Revision 1.4  1994/08/17  14:27:32  quinn
+ * last mods
+ *
+ * Revision 1.2  1994/08/17  14:09:32  quinn
+ * Compiles cleanly (still only dummy).
+ *
+ * Revision 1.1  1994/08/17  13:55:08  quinn
+ * New blocksystem. dummy only
  *
  */
 
-#include <util.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdlib.h>
+
+#include <alexutil.h>
+#include <bfile.h>
 
 int bf_close (BFile bf)
 {
-    close(bf->fd);
+    mf_close(bf->mf);
     xfree(bf);
     return(0);
 }
 
-BFile bf_open (const char *name, int block_size, int cache, wflag)
+BFile bf_open (const char *name, int block_size, int wflag)
 {
     BFile tmp = xmalloc(sizeof(BFile_struct));
 
-    if ((tmp->fd = open(name, wflag ? O_RDWR : O_RDONLY, 0666)) < 0)
+    if (!(tmp->mf = mf_open(0, name, block_size, wflag)))
     {
-        log(LOG_FATAL, "open: %s"); 
-	return(-1);
+        logf (LOG_FATAL, "Mfopen failed for %s", name); 
+	return(0);
     }
     return(tmp);
 }
 
-int bf_read (BFile bf, int no, int offset, int no, void *buf);
+int bf_read (BFile bf, int no, int offset, int num, void *buf)
+{
+    return mf_read(bf->mf, no, offset, num, buf);
+}
+
+int bf_write (BFile bf, int no, int offset, int num, const void *buf)
 {
-    if (seek
+    return mf_write(bf->mf, no, offset, num, buf);
 }
-int bf_write (BFile bf, int no, int offset, int no, const void *buf);