X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=8e4fb79a130c882355ab9fe90387f8140ca889ea;hb=a4e93d62564084d6d1b6670d4fe75dd70a6ed139;hp=988523111e30c1d49ffc8b8fa0f30da85475b5c8;hpb=ac2780bc12c8c2fce4c5e2bfe4c4dbb58616b8e2;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 9885231..8e4fb79 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -1,10 +1,27 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.26  1997-10-27 14:25:38  adam
+ * 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.
+ *
+ * Revision 1.27  1998/02/10 11:55:07  adam
+ * Minor changes.
+ *
+ * Revision 1.26  1997/10/27 14:25:38  adam
  * Fixed memory leaks.
  *
  * Revision 1.25  1997/09/18 08:59:16  adam
@@ -93,7 +110,7 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -127,8 +144,10 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
             ad++;
         if (!*ad)
             break;
-        while (*ad && *ad != ':')
+        while (*ad)
         {
+	    if (*ad == ':' && strchr ("+-0123456789", ad[1]))
+		break;
             if (i < FILENAME_MAX)
                 dirname[i++] = *ad;
             ad++;
@@ -261,7 +280,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;
@@ -391,7 +410,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;
@@ -499,8 +518,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");
@@ -552,7 +572,8 @@ int mf_write(MFile mf, int no, int offset, int num, const void *buf)
     towrite = num ? num : mf->blocksize;
     if (write(mf->files[mf->cur_file].fd, buf, towrite) < towrite)
     {
-    	logf (LOG_FATAL|LOG_ERRNO, "Write failed");
+    	logf (LOG_FATAL|LOG_ERRNO, "Write failed for file %s part %d",
+		mf->name, mf->cur_file);
     	exit(1);
     }
     return 0;