X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=dfd60d238e7df13a05798a0e6700189651894991;hb=19b3a576969e77f965d0d2c915b40821db2aa265;hp=78528ff83ae48910a88ccc01ad2e34678e7f4ab2;hpb=90a8309f2165abe2cd76e096837d886cc9fe89fb;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 78528ff..dfd60d2 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,28 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.13  1995-11-30 17:00:50  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
@@ -58,6 +79,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
+#include <errno.h>
 
 #include <alexutil.h>
 #include <mfile.h>
@@ -71,8 +93,7 @@ static int scan_areadef(MFile_area ma, const char *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; 
+    char dirname[FILENAME_MAX+1]; 
     mf_dir **dp = &ma->dirs, *dir = *dp;
 
     if (!ad)
@@ -82,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;
 }
@@ -117,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++;
@@ -167,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;
@@ -323,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)
@@ -391,7 +450,6 @@ 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 (mf->files[mf->cur_file].dir->max_bytes >= 0 &&
 	    (ps - mf->files[mf->cur_file].blocks + 1) * mf->blocksize >
@@ -469,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;
 }