Added structure year and date.

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

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 8e4fb79..31bc486 100644 (file)
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.31  1999-02-18 12:49:33  adam
+ * Revision 1.36  1999-12-08 15:03:11  adam
+ * Implemented bf_reset.
+ *
+ * Revision 1.35  1999/10/14 14:33:50  adam
+ * Added truncation 5=106.
+ *
+ * Revision 1.34  1999/05/26 07:49:12  adam
+ * C++ compilation.
+ *
+ * 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.
  *
@@ -155,12 +170,12 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
         dirname[i] = '\0';
         if (*ad++ != ':')
         {
-           logf (LOG_FATAL, "Missing colon after path: %s", ad0);
+           logf (LOG_WARN, "Missing colon after path: %s", ad0);
             return -1;
         }
         if (i == 0)
         {
-           logf (LOG_FATAL, "Empty path: %s", ad0);
+           logf (LOG_WARN, "Empty path: %s", ad0);
             return -1;
         }
         while (*ad == ' ' || *ad == '\t')
@@ -194,7 +209,7 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
                return -1;
        }
         ad++;
-       *dp = dir = xmalloc(sizeof(mf_dir));
+       *dp = dir = (mf_dir *) xmalloc(sizeof(mf_dir));
        dir->next = 0;
        strcpy(dir->name, dirname);
        dir->max_bytes = dir->avail_bytes = fact * size * multi;
@@ -225,13 +240,13 @@ static int file_position(MFile mf, int pos, int offset)
     {
         if (!mf->wr && errno == ENOENT && off == 0)
             return -2;
-       logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
+       logf (LOG_WARN|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
        return -1;
     }
     if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize + offset,
        SEEK_SET) < 0)
     {
-       logf (LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
+       logf (LOG_WARN|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
        return -1;
     }
     mf->cur_file = c;
@@ -249,7 +264,7 @@ static int cmp_part_file(const void *p1, const void *p2)
  */
 MFile_area mf_init(const char *name, const char *spec)
 {
-    MFile_area ma = xmalloc(sizeof(*ma));
+    MFile_area ma = (MFile_area) xmalloc(sizeof(*ma));
     mf_dir *dirp;
     meta_file *meta_f;
     part_file *part_f = 0;
@@ -264,7 +279,7 @@ MFile_area mf_init(const char *name, const char *spec)
     ma->dirs = 0;
     if (scan_areadef(ma, name, spec) < 0)
     {
-       logf (LOG_FATAL, "Failed to access description of '%s'", name);
+       logf (LOG_WARN, "Failed to access description of '%s'", name);
        return 0;
     }
     /* look at each directory */
@@ -272,7 +287,8 @@ MFile_area mf_init(const char *name, const char *spec)
     {
        if (!(dd = opendir(dirp->name)))
        {
-           logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", dirp->name);
+           logf (LOG_WARN|LOG_ERRNO, "Failed to open directory %s",
+                                     dirp->name);
            return 0;
        }
        /* look at each file */
@@ -297,7 +313,7 @@ MFile_area mf_init(const char *name, const char *spec)
            /* new metafile */
            if (!meta_f)
            {
-               meta_f = xmalloc(sizeof(*meta_f));
+               meta_f = (meta_file *) xmalloc(sizeof(*meta_f));
                meta_f->ma = ma;
                meta_f->next = ma->mfiles;
                meta_f->open = 0;
@@ -371,13 +387,37 @@ void mf_destroy(MFile_area ma)
     xfree (ma);
 }
 
+void mf_reset(MFile_area ma)
+{
+    meta_file *meta_f;
+
+    if (!ma)
+       return;
+    meta_f = ma->mfiles;
+    while (meta_f)
+    {
+       int i;
+       meta_file *m = meta_f;
+
+       assert (!m->open);
+       for (i = 0; i<m->no_files; i++)
+       {
+           unlink (m->files[i].path);
+           xfree (m->files[i].path);
+       }
+       meta_f = meta_f->next;
+       xfree (m);
+    }
+    ma->mfiles = 0;
+}
+
 /*
  * Open a metafile.
  * If !ma, Use MF_DEFAULT_AREA.
  */
 MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
 {
-    struct meta_file *mnew;
+    meta_file *mnew;
     int i;
     char tmp[FILENAME_MAX+1];
     mf_dir *dp;
@@ -387,13 +427,15 @@ 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));
+       mnew = (meta_file *) xmalloc(sizeof(*mnew));
        strcpy(mnew->name, name);
        /* allocate one, empty file */
        mnew->no_files = 1;
@@ -468,16 +510,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)",
@@ -493,7 +537,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;
@@ -551,7 +595,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++;
@@ -569,7 +613,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",