X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=714bba87879141199629dfb2eba076a0598c4505;hb=ef495f3c3ac61351628014c7f186adb843d5286b;hp=a198deb2d039a75b3ee1591ae3521e16ea0cff64;hpb=9093a8876a4cdc25b8ccdb36940f51d9008aa1a7;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index a198deb..714bba8 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.4  1994-09-01 14:51:07  quinn
+ * Revision 1.7  1994-09-19 14:12:37  quinn
+ * dunno.
+ *
+ * Revision 1.6  1994/09/14  13:10:15  quinn
+ * Corrected some bugs in the init-phase
+ *
+ * Revision 1.5  1994/09/12  08:01:51  quinn
+ * Small
+ *
+ * Revision 1.4  1994/09/01  14:51:07  quinn
  * Allowed mf_write to write beyond eof+1.
  *
  * Revision 1.3  1994/08/24  09:37:17  quinn
@@ -18,6 +27,12 @@
  *
  */
 
+
+ /*
+  * TODO: The size estimates in init may not be accurate due to
+  * only partially written final blocks.
+  */
+
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -72,7 +87,7 @@ static int scan_areadef(MFile_area ma, const char *name)
     return 0;
 }
 
-static int file_position(MFile mf, int pos)
+static int file_position(MFile mf, int pos, int offset)
 {
     int off = 0, c = mf->cur_file, ps;
 
@@ -95,7 +110,8 @@ static int file_position(MFile mf, int pos)
     	log(LOG_FATAL|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
     	return -1;
     }
-    if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize, SEEK_SET) < 0)
+    if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize + offset,
+    	SEEK_SET) < 0)
     {
     	log(LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
     	return -1;
@@ -124,6 +140,7 @@ MFile_area mf_init(const char *name)
     int fd, number;
     char metaname[FILENAME_MAX+1], tmpnam[FILENAME_MAX+1];
 
+    log(LOG_DEBUG, "mf_init(%s)", name);
     for (mp = open_areas; mp; mp = mp->next)
     	if (!strcmp(name, mp->name))
     	    abort();
@@ -219,6 +236,8 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
     char tmp[FILENAME_MAX+1];
     mf_dir *dp;
 
+    log(LOG_LOG, "mf_open(%s bs=%d, %s)", name, block_size,
+    	wflag ? "RW" : "RDONLY");
     if (!ma)
     {
         if (!default_area && !(default_area = mf_init(MF_DEFAULT_AREA)))
@@ -259,6 +278,13 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
     }
     else
     {
+    	for (i = 0; i < new->no_files; i++)
+    	{
+	    if (new->files[i].bytes % block_size)
+	    	new->files[i].bytes += block_size - new->files[i].bytes %
+		    block_size;
+	    new->files[i].blocks = new->files[i].bytes / block_size;
+	}
     	assert(!new->open);
     }
     new->blocksize = block_size;
@@ -286,6 +312,7 @@ int mf_close(MFile mf)
 {
     int i;
 
+    log(LOG_DEBUG, "mf_close()");
     assert(mf->open);
     for (i = 0; i < mf->no_files; i++)
     	if (mf->files[i].fd >= 0)
@@ -299,16 +326,18 @@ int mf_close(MFile mf)
  */
 int mf_read(MFile mf, int no, int offset, int num, void *buf)
 {
-    int rd;
+    int rd, toread;
 
-    if (file_position(mf, no) < 0)
+    if (file_position(mf, no, offset) < 0)
     	exit(1);
-    if ((rd = read(mf->files[mf->cur_file].fd, buf, mf->blocksize)) < 0)
+    toread = num ? num : mf->blocksize;
+    if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
     {
-    	log(LOG_FATAL|LOG_ERRNO, "Read failed");
+    	log(LOG_FATAL|LOG_ERRNO, "mf_read: Read failed (%s)",
+    		mf->files[mf->cur_file].path);
     	exit(1);
     }
-    else if (rd < mf->blocksize)
+    else if (rd < toread)
     	return 0;
     else
     	return 1;
@@ -319,12 +348,12 @@ int mf_read(MFile mf, int no, int offset, int num, void *buf)
  */
 int mf_write(MFile mf, int no, int offset, int num, const void *buf)
 {
-    int ps, nblocks;
+    int ps, nblocks, towrite;
     mf_dir *dp;
     char tmp[FILENAME_MAX+1];
     unsigned char dummych = '\xff';
 
-    if ((ps = file_position(mf, no)) < 0)
+    if ((ps = file_position(mf, no, offset)) < 0)
 	exit(1);
     /* file needs to grow */
     while (ps >= mf->files[mf->cur_file].blocks)
@@ -342,7 +371,7 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
 		    mf->files[mf->cur_file].path, nblocks);
 	    	if ((ps = file_position(mf,
 		    (mf->cur_file ? mf->files[mf->cur_file-1].top : 0) +
-		    mf->files[mf->cur_file].blocks + nblocks)) < 0)
+		    mf->files[mf->cur_file].blocks + nblocks, 0)) < 0)
 			exit(1);
 		if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1)
 		{
@@ -378,7 +407,7 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
 	    mf->files[mf->cur_file].path = xstrdup(tmp);
 	    mf->no_files++;
 	    /* open new file and position at beginning */
-	    if ((ps = file_position(mf, no)) < 0)
+	    if ((ps = file_position(mf, no, offset)) < 0)
 	    	exit(1);
 	}
 	else
@@ -389,7 +418,8 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
 	    mf->files[mf->cur_file].dir->avail_bytes -= nblocks * mf->blocksize;
 	}
     }
-    if (write(mf->files[mf->cur_file].fd, buf, mf->blocksize) < mf->blocksize)
+    towrite = num ? num : mf->blocksize;
+    if (write(mf->files[mf->cur_file].fd, buf, towrite) < towrite)
     {
     	log(LOG_FATAL|LOG_ERRNO, "Write failed");
     	exit(1);