X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=7720bf96040841596402dfcf729167d6db854c57;hb=bceca936710690858ea162e7bc22de819f0e280f;hp=a9dc9f6f3494a28981c4d9bacdef0f6cd9fdff87;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index a9dc9f6..7720bf9 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.30  1999-02-02 14:50:02  adam
+ * Revision 1.33  1999-05-12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.32  1999/04/28 14:53:07  adam
+ * Fixed stupid bug regarding split-files.
+ *
+ * Revision 1.31  1999/02/18 12:49:33  adam
+ * Changed file naming scheme for register files as well as record
+ * store/index files.
+ *
+ * Revision 1.30  1999/02/02 14:50:02  adam
  * Updated WIN32 code specific sections. Changed header.
  *
  * Revision 1.29  1998/05/27 14:28:34  adam
@@ -276,7 +286,7 @@ MFile_area mf_init(const char *name, const char *spec)
 	{
 	    if (*dent->d_name == '.')
 	    	continue;
-	    if (sscanf(dent->d_name, "%[^.].mf.%d", metaname, &number) != 2)
+	    if (sscanf(dent->d_name, "%[^-]-%d.mf", metaname, &number) != 2)
 	    {
 	    	logf (LOG_DEBUG, "bf: %s is not a part-file.", dent->d_name);
 	    	continue;
@@ -383,10 +393,12 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
     assert (ma);
     for (mnew = ma->mfiles; mnew; mnew = mnew->next)
     	if (!strcmp(name, mnew->name))
+	{
     	    if (mnew->open)
     	        abort();
 	    else
 	        break;
+	}
     if (!mnew)
     {
     	mnew = xmalloc(sizeof(*mnew));
@@ -406,7 +418,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
 	    return 0;
 	}
 	mnew->files[0].dir = dp;
-    	sprintf(tmp, "%s/%s.mf.%d", dp->name, mnew->name, 0);
+    	sprintf(tmp, "%s/%s-%d.mf", dp->name, mnew->name, 0);
     	mnew->files[0].path = xstrdup(tmp);
     	mnew->ma = ma;
 	mnew->next = ma->mfiles;
@@ -464,16 +476,18 @@ int mf_close(MFile mf)
 /*
  * Read one block from a metafile. Interface mirrors bfile.
  */
-int mf_read(MFile mf, int no, int offset, int num, void *buf)
+int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
 {
     int rd, toread;
 
     if ((rd = file_position(mf, no, offset)) < 0)
+    {
         if (rd == -2)
             return 0;
         else
             exit(1);
-    toread = num ? num : mf->blocksize;
+    }
+    toread = nbytes ? nbytes : mf->blocksize;
     if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
     {
     	logf (LOG_FATAL|LOG_ERRNO, "mf_read: Read failed (%s)",
@@ -489,7 +503,7 @@ int mf_read(MFile mf, int no, int offset, int num, void *buf)
 /*
  * Write.
  */
-int mf_write(MFile mf, int no, int offset, int num, const void *buf)
+int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
 {
     int ps, nblocks, towrite;
     mf_dir *dp;
@@ -547,7 +561,7 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
 	    mf->files[mf->cur_file].blocks =
 	    	mf->files[mf->cur_file].bytes = 0;
 	    mf->files[mf->cur_file].fd = -1;
-	    sprintf(tmp, "%s/%s.mf.%d", dp->name, mf->name,
+	    sprintf(tmp, "%s/%s-%d.mf", dp->name, mf->name,
 		mf->files[mf->cur_file].number);
 	    mf->files[mf->cur_file].path = xstrdup(tmp);
 	    mf->no_files++;
@@ -565,7 +579,7 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
 		nblocks * mf->blocksize;
 	}
     }
-    towrite = num ? num : mf->blocksize;
+    towrite = nbytes ? nbytes : mf->blocksize;
     if (write(mf->files[mf->cur_file].fd, buf, towrite) < towrite)
     {
     	logf (LOG_FATAL|LOG_ERRNO, "Write failed for file %s part %d",