X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=bfile%2Fmfile.c;h=78528ff83ae48910a88ccc01ad2e34678e7f4ab2;hb=25c9afa691b8f62c2a17150cf1febd1f61755b12;hp=3340a9fe3ca81078068bd7b40678ce7c37a5fbbb;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 3340a9f..78528ff 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.10  1995-09-04 12:33:22  adam
+ * Revision 1.13  1995-11-30 17:00:50  adam
+ * Several bug fixes. Commit system runs now.
+ *
+ * Revision 1.12  1995/11/24  17:26:11  quinn
+ * Mostly about making some ISAM stuff in the config file optional.
+ *
+ * Revision 1.11  1995/11/13  09:32:43  quinn
+ * Comment work.
+ *
+ * Revision 1.10  1995/09/04  12:33:22  adam
  * Various cleanup. YAZ util used instead.
  *
  * Revision 1.9  1994/11/04  14:26:39  quinn
@@ -58,7 +67,10 @@ static MFile_area_struct *default_area = 0;
 
 static int scan_areadef(MFile_area ma, const char *name)
 {
-    const char *ad = res_get(common_resource, name);
+    /*
+     * If no definition is given, use current directory, unlimited.
+     */
+    const char *ad = res_get_def(common_resource, name, ".:-1b");
     int offset = 0, rs, size, multi, rd;
     char dirname[FILENAME_MAX+1], unit; 
     mf_dir **dp = &ma->dirs, *dir = *dp;
@@ -117,6 +129,8 @@ static int file_position(MFile mf, int pos, int offset)
     if (mf->files[c].fd < 0 && (mf->files[c].fd = open(mf->files[c].path,
 	mf->wr ? O_RDWR|O_CREAT : O_RDONLY, 0666)) < 0)
     {
+        if (!mf->wr && errno == ENOENT && off == 0)
+            return -2;
     	logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
     	return -1;
     }
@@ -177,11 +191,10 @@ MFile_area mf_init(const char *name)
 	{
 	    if (*dent->d_name == '.')
 	    	continue;
-	    if (sscanf(dent->d_name, "%[^.].%d", metaname, &number) != 2)
+	    if (sscanf(dent->d_name, "%[^.].mf.%d", metaname, &number) != 2)
 	    {
-	    	logf (LOG_FATAL, "Failed to resolve part-name %s",
-                      dent->d_name);
-	    	return 0;
+	    	logf (LOG_DEBUG, "bf: %s is not a part-file.", dent->d_name);
+	    	continue;
 	    }
 	    for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
 	    {
@@ -224,7 +237,8 @@ MFile_area mf_init(const char *name)
 	    	return 0;
 	    }
 	    close(fd);
-	    dirp->avail_bytes -= part_f->bytes;
+	    if (dirp->max_bytes >= 0)
+		dirp->avail_bytes -= part_f->bytes;
 	}
 	closedir(dd);
     }
@@ -249,7 +263,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
     char tmp[FILENAME_MAX+1];
     mf_dir *dp;
 
-    logf(LOG_LOG, "mf_open(%s bs=%d, %s)", name, block_size,
+    logf(LOG_DEBUG, "mf_open(%s bs=%d, %s)", name, block_size,
          wflag ? "RW" : "RDONLY");
     if (!ma)
     {
@@ -277,15 +291,15 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
     	new->files[0].number = 0;
     	new->files[0].fd = -1;
     	new->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
-    	for (dp = ma->dirs; dp && dp->avail_bytes < new->min_bytes_creat;
-	    dp = dp->next);
+    	for (dp = ma->dirs; dp && dp->max_bytes >= 0 && dp->avail_bytes <
+	    new->min_bytes_creat; dp = dp->next);
 	if (!dp)
 	{
 	    logf (LOG_FATAL, "Insufficient space for new mfile.");
 	    return 0;
 	}
 	new->files[0].dir = dp;
-    	sprintf(tmp, "%s/%s.%d", dp->name, new->name, 0);
+    	sprintf(tmp, "%s/%s.mf.%d", dp->name, new->name, 0);
     	new->files[0].path = xstrdup(tmp);
     	new->ma = ma;
     }
@@ -344,8 +358,11 @@ int mf_read(MFile mf, int no, int offset, int num, void *buf)
 {
     int rd, toread;
 
-    if (file_position(mf, no, offset) < 0)
-    	exit(1);
+    if ((rd = file_position(mf, no, offset)) < 0)
+        if (rd == -2)
+            return 0;
+        else
+            exit(1);
     toread = num ? num : mf->blocksize;
     if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
     {
@@ -376,7 +393,8 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
     {
     	logf (LOG_DEBUG, "File grows");
     	/* file overflow - allocate new file */
-    	if ((ps - mf->files[mf->cur_file].blocks + 1) * mf->blocksize >
+    	if (mf->files[mf->cur_file].dir->max_bytes >= 0 &&
+	    (ps - mf->files[mf->cur_file].blocks + 1) * mf->blocksize >
 	    mf->files[mf->cur_file].dir->avail_bytes)
 	{
 	    /* cap off file? */
@@ -401,8 +419,8 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
 	    }
 	    /* get other bit */
     	    logf (LOG_DEBUG, "Creating new file.");
-    	    for (dp = mf->ma->dirs; dp && dp->avail_bytes < mf->min_bytes_creat;
-		dp = dp->next);
+    	    for (dp = mf->ma->dirs; dp && dp->max_bytes >= 0 &&
+		dp->avail_bytes < mf->min_bytes_creat; dp = dp->next);
 	    if (!dp)
 	    {
 	    	logf (LOG_FATAL, "Cannot allocate more space for %s",
@@ -419,7 +437,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.%d", dp->name, mf->name,
+	    sprintf(tmp, "%s/%s.mf.%d", dp->name, mf->name,
 		mf->files[mf->cur_file].number);
 	    mf->files[mf->cur_file].path = xstrdup(tmp);
 	    mf->no_files++;
@@ -432,7 +450,9 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
 	    nblocks = ps - mf->files[mf->cur_file].blocks + 1;
 	    mf->files[mf->cur_file].blocks += nblocks;
 	    mf->files[mf->cur_file].bytes += nblocks * mf->blocksize;
-	    mf->files[mf->cur_file].dir->avail_bytes -= nblocks * mf->blocksize;
+	    if (mf->files[mf->cur_file].dir->max_bytes >= 0)
+		mf->files[mf->cur_file].dir->avail_bytes -=
+		nblocks * mf->blocksize;
 	}
     }
     towrite = num ? num : mf->blocksize;