From f28af032bfde7cf88aaf3d186a4bfd43694f9ec4 Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Wed, 24 Aug 1994 08:45:48 +0000 Subject: [PATCH] Using mfile. --- bfile/bfile.c | 18 +++++++++--------- include/bfile.h | 11 +++++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/bfile/bfile.c b/bfile/bfile.c index dd10b4f..b2ae49f 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.c,v $ - * Revision 1.8 1994-08-23 15:03:34 quinn + * 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 @@ -36,7 +39,7 @@ int bf_close (BFile bf) { - close(bf->fd); + mf_close(bf->mf); xfree(bf); return(0); } @@ -45,23 +48,20 @@ 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_CREAT : O_RDONLY, 0666)) < 0) + if (!(tmp->mf = mf_open(0, name, block_size, wflag))) { - log(LOG_FATAL|LOG_ERRNO, "open %s", name); + log(LOG_FATAL|LOG_ERRNO, "mfopen %s", name); return(0); } - tmp->block_size = block_size; return(tmp); } int bf_read (BFile bf, int no, int offset, int num, void *buf) { - lseek(bf->fd, no * bf->block_size + offset, 0); - return(read(bf->fd, buf, num ? num : bf->block_size)); + return mf_read(bf->mf, no, offset, num, buf); } int bf_write (BFile bf, int no, int offset, int num, const void *buf) { - lseek(bf->fd, no * bf->block_size + offset, 0); - return(write(bf->fd, buf, num ? num : bf->block_size)); + return mf_write(bf->mf, no, offset, num, buf); } diff --git a/include/bfile.h b/include/bfile.h index ac49024..2a5bf98 100644 --- a/include/bfile.h +++ b/include/bfile.h @@ -4,9 +4,12 @@ * Sebastian Hammer, Adam Dickmeiss * $Log: bfile.h,v $ - Revision 1.4 1994-08-17 15:38:28 adam - Include of util.h. + Revision 1.5 1994-08-24 08:45:52 quinn + Using mfile. + * Revision 1.4 1994/08/17 15:38:28 adam + * Include of util.h. + * * Revision 1.3 1994/08/17 14:09:47 quinn * Small changes * @@ -16,11 +19,11 @@ #define BFILE_H #include +#include typedef struct BFile_struct { - int fd; - int block_size; + MFile mf; } *BFile, BFile_struct; int bf_close (BFile); -- 1.7.10.4