First version of ISAMS.

[idzebra-moved-to-github.git] / bfile / mfile.c

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 342512f..7720bf9 100644 (file)
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -1,10 +1,26 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.28  1998-05-20 10:00:35  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
+ * Fixed bug in mf_write. 'Cap off' byte written at wrong offset.
+ *
+ * Revision 1.28  1998/05/20 10:00:35  adam
  * Fixed register spec so that colon isn't treated as size separator
  * unless followed by [0-9+-] in order to allow DOS drive specifications.
  *
@@ -100,7 +116,7 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -270,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;
@@ -377,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));
@@ -400,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;
@@ -458,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)",
@@ -483,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;
@@ -508,8 +528,9 @@ 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)) < 0)
+                   mf->files[mf->cur_file].blocks + nblocks - 1, 0)) < 0)
                        exit(1);
+               logf (LOG_DEBUG, "ps = %d", ps);
                if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1)
                {
                    logf (LOG_ERRNO|LOG_FATAL, "write dummy");
@@ -540,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++;
@@ -558,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",