X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=dfd60d238e7df13a05798a0e6700189651894991;hb=42143dd8393ba4fbad62289dcff47b150c1f4be5;hp=3340a9fe3ca81078068bd7b40678ce7c37a5fbbb;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 3340a9f..dfd60d2 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,37 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.10  1995-09-04 12:33:22  adam
+ * Revision 1.20  1996-05-14 12:10:16  quinn
+ * Bad areadef scan
+ *
+ * Revision 1.19  1996/05/01  07:16:30  quinn
+ * Fixed ancient bug.
+ *
+ * Revision 1.18  1996/04/09  06:47:30  adam
+ * Function scan_areadef doesn't use sscanf (%n fails on this Linux).
+ *
+ * Revision 1.17  1996/03/20 13:29:11  quinn
+ * Bug-fix
+ *
+ * Revision 1.16  1995/12/12  15:57:57  adam
+ * Implemented mf_unlink. cf_unlink uses mf_unlink.
+ *
+ * Revision 1.15  1995/12/08  16:21:14  adam
+ * Work on commit/update.
+ *
+ * Revision 1.14  1995/12/05  13:12:37  quinn
+ * Added <errno.h>
+ *
+ * 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
@@ -49,6 +79,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
+#include <errno.h>
 
 #include <alexutil.h>
 #include <mfile.h>
@@ -58,9 +89,11 @@ 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);
-    int offset = 0, rs, size, multi, rd;
-    char dirname[FILENAME_MAX+1], unit; 
+    /*
+     * If no definition is given, use current directory, unlimited.
+     */
+    const char *ad = res_get_def(common_resource, name, ".:-1b");
+    char dirname[FILENAME_MAX+1]; 
     mf_dir **dp = &ma->dirs, *dir = *dp;
 
     if (!ad)
@@ -70,29 +103,66 @@ static int scan_areadef(MFile_area ma, const char *name)
     }
     for (;;)
     {
-        rs = sscanf(ad + offset, "%[^:]:%d%c %n", dirname, &size, &unit, &rd);
-        if (rs <= 1)
-	    break;
-        if (rs != 3)
+        const char *ad0 = ad;
+        int i = 0, fact = 1, multi, size = 0;
+
+        while (*ad == ' ' || *ad == '\t')
+            ad++;
+        if (!*ad)
+            break;
+        while (*ad && *ad != ':')
         {
-	    logf (LOG_FATAL, "Illegal directory description: %s", ad + offset);
-	    return -1;
-	}
-	switch (unit)
+            if (i < FILENAME_MAX)
+                dirname[i++] = *ad;
+            ad++;
+        }
+        dirname[i] = '\0';
+        if (*ad++ != ':')
+        {
+	    logf (LOG_FATAL, "Missing colon after path: %s", ad0);
+            return -1;
+        }
+        if (i == 0)
+        {
+	    logf (LOG_FATAL, "Empty path: %s", ad0);
+            return -1;
+        }
+        while (*ad == ' ' || *ad == '\t')
+            ad++;
+        if (*ad == '-')
+        {
+            fact = -1;
+            ad++;
+        }
+        else if (*ad == '+')
+            ad++;
+        size = 0;
+        if (*ad < '0' || *ad > '9')
+        {
+	    logf (LOG_FATAL, "Missing size after path: %s", ad0);
+            return -1;
+        }
+        size = 0;
+        while (*ad >= '0' && *ad <= '9')
+            size = size*10 + (*ad++ - '0');
+        switch (*ad)
 	{
 	    case 'B': case 'b': multi = 1; break;
 	    case 'K': case 'k': multi = 1024; break;
 	    case 'M': case 'm': multi = 1048576; break;
+            case '\0':
+	        logf (LOG_FATAL, "Missing unit: %s", ad0);
+		return -1;
 	    default:
-	        logf (LOG_FATAL, "Illegal unit: %c in %s", unit, ad + offset);
+	        logf (LOG_FATAL, "Illegal unit: %c in %s", *ad, ad0);
 	        return -1;
 	}
+        ad++;
 	*dp = dir = xmalloc(sizeof(mf_dir));
 	dir->next = 0;
 	strcpy(dir->name, dirname);
-	dir->max_bytes = dir->avail_bytes = size * multi;
+	dir->max_bytes = dir->avail_bytes = fact * size * multi;
 	dp = &dir->next;
-	offset += rd;
     }
     return 0;
 }
@@ -105,7 +175,7 @@ static int file_position(MFile mf, int pos, int offset)
 	(c < mf->no_files -1 && pos > mf->files[c].top))
     {
 	c = 0;
-	while (mf->files[c].top >= 0 && mf->files[c].top < pos)
+	while (c + 1 < mf->no_files && mf->files[c].top < pos)
 	{
 	    off += mf->files[c].blocks;
 	    c++;
@@ -117,6 +187,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;
     }
@@ -153,7 +225,8 @@ MFile_area mf_init(const char *name)
     logf (LOG_DEBUG, "mf_init(%s)", name);
     for (mp = open_areas; mp; mp = mp->next)
     	if (!strcmp(name, mp->name))
-    	    abort();
+    	    return mp;
+    ma = xmalloc(sizeof(MFile_area_struct));
     strcpy(ma->name, name);
     ma->next = open_areas;
     open_areas = ma;
@@ -177,11 +250,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 +296,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 +322,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 +350,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;
     }
@@ -309,7 +382,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
     for (i = 0; i < new->no_files; i++)
     {
     	new->files[i].blocks = new->files[i].bytes / new->blocksize;
-    	if (i == new->no_files)
+    	if (i == new->no_files - 1)
 	    new->files[i].top = -1;
 	else
 	    new->files[i].top = i ? (new->files[i-1].top + new->files[i].blocks)
@@ -344,8 +417,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)
     {
@@ -374,9 +450,9 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
     /* file needs to grow */
     while (ps >= mf->files[mf->cur_file].blocks)
     {
-    	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 +477,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 +495,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 +508,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;
@@ -449,7 +527,10 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
  */
 int mf_unlink(MFile mf)
 {
-    abort();
+    int i;
+
+    for (i = 0; i < mf->no_files; i++)
+        unlink (mf->files[i].path);
     return 0;
 }