X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=8e85e79d236a57cab55628d5c0272718755062ee;hb=9839f960344403921a7740bed060088054034a5d;hp=6afd61129a2c20918ef14b98304e7404d20753fc;hpb=c1a85f9caaa8476a69b392349e90b7c4981e7db3;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 6afd611..8e85e79 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -1,130 +1,9 @@
 /*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: mfile.c,v $
- * Revision 1.39  2000-05-05 13:48:03  adam
- * Fixed locking for metafiles.
- *
- * Revision 1.38  2000/03/20 19:08:35  adam
- * Added remote record import using Z39.50 extended services and Segment
- * Requests.
- *
- * Revision 1.37  2000/03/15 15:00:30  adam
- * First work on threaded version.
- *
- * 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.
- *
- * 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
- * Extra generic handle for the character mapping routines.
- *
- * Revision 1.24  1997/09/17 12:19:06  adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.23  1997/09/09 13:37:53  adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.22  1997/09/04 13:56:39  adam
- * Added O_BINARY to open calls.
- *
- * Revision 1.21  1996/10/29 13:56:18  adam
- * Include of zebrautl.h instead of alexutil.h.
- *
- * 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
- * bug-fix.
- *
- * Revision 1.8  1994/10/05  16:56:42  quinn
- * Minor.
- *
- * Revision 1.7  1994/09/19  14:12:37  quinn
- * dunno.
- *
- * Revision 1.6  1994/09/14  13:10:15  quinn
- * Corrected some bugs in the init-phase
- *
- * Revision 1.5  1994/09/12  08:01:51  quinn
- * Small
- *
- * Revision 1.4  1994/09/01  14:51:07  quinn
- * Allowed mf_write to write beyond eof+1.
- *
- * Revision 1.3  1994/08/24  09:37:17  quinn
- * Changed reaction to read return values.
- *
- * Revision 1.2  1994/08/23  14:50:48  quinn
- * Fixed mf_close().
- *
- * Revision 1.1  1994/08/23  14:41:33  quinn
- * First functional version.
- *
+ * $Id: mfile.c,v 1.46 2002-07-16 09:52:20 heikki Exp $
  */
 
 
@@ -151,7 +30,7 @@
 #include <zebrautl.h>
 #include <mfile.h>
 
-static int scan_areadef(MFile_area ma, const char *name, const char *ad)
+static int scan_areadef(MFile_area ma, const char *ad, const char *base)
 {
     /*
      * If no definition is given, use current directory, unlimited.
@@ -160,7 +39,7 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
     mf_dir **dp = &ma->dirs, *dir = *dp;
 
     if (!ad)
-	ad = ".:-1b";
+        ad = ".:-1b";
     for (;;)
     {
         const char *ad0 = ad;
@@ -171,6 +50,12 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
             ad++;
         if (!*ad)
             break;
+        if (!yaz_is_abspath(ad) && base)
+        {
+            strcpy (dirname, base);
+            i = strlen(dirname);
+            dirname[i++] = '/';
+        }
         while (*ad)
         {
 	    if (*ad == ':' && strchr ("+-0123456789", ad[1]))
@@ -214,12 +99,12 @@ static int scan_areadef(MFile_area ma, const char *name, const char *ad)
 	case 'K': case 'k': multi = 1024; break;
 	case 'M': case 'm': multi = 1048576; break;
 	case 'G': case 'g': multi = 1073741824; break;
-            case '\0':
-	        logf (LOG_FATAL, "Missing unit: %s", ad0);
-		return -1;
-	    default:
-	        logf (LOG_FATAL, "Illegal unit: %c in %s", *ad, ad0);
-	        return -1;
+        case '\0':
+            logf (LOG_FATAL, "Missing unit: %s", ad0);
+            return -1;
+        default:
+            logf (LOG_FATAL, "Illegal unit: %c in %s", *ad, ad0);
+            return -1;
 	}
         ad++;
 	*dp = dir = (mf_dir *) xmalloc(sizeof(mf_dir));
@@ -248,13 +133,18 @@ static int file_position(MFile mf, int pos, int offset)
     }
     else
     	off = c ? (mf->files[c-1].top + 1) : 0;
-    if (mf->files[c].fd < 0 && (mf->files[c].fd = open(mf->files[c].path,
-	mf->wr ? (O_BINARY|O_RDWR|O_CREAT) : (O_BINARY|O_RDONLY), 0666)) < 0)
+    if (mf->files[c].fd < 0)
     {
-        if (!mf->wr && errno == ENOENT && off == 0)
-            return -2;
-    	logf (LOG_WARN|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
-    	return -1;
+        if ((mf->files[c].fd = open(mf->files[c].path,
+	                            mf->wr ?
+                                        (O_BINARY|O_RDWR|O_CREAT) :
+                                        (O_BINARY|O_RDONLY), 0666)) < 0)
+        {
+            if (!mf->wr && errno == ENOENT && off == 0)
+                return -2;
+    	    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)
@@ -275,7 +165,7 @@ static int cmp_part_file(const void *p1, const void *p2)
  * Create a new area, cotaining metafiles in directories.
  * Find the part-files in each directory, and inventory the existing metafiles.
  */
-MFile_area mf_init(const char *name, const char *spec)
+MFile_area mf_init(const char *name, const char *spec, const char *base)
 {
     MFile_area ma = (MFile_area) xmalloc(sizeof(*ma));
     mf_dir *dirp;
@@ -290,7 +180,7 @@ MFile_area mf_init(const char *name, const char *spec)
     strcpy(ma->name, name);
     ma->mfiles = 0;
     ma->dirs = 0;
-    if (scan_areadef(ma, name, spec) < 0)
+    if (scan_areadef(ma, spec, base) < 0)
     {
     	logf (LOG_WARN, "Failed to access description of '%s'", name);
     	return 0;
@@ -307,13 +197,16 @@ MFile_area mf_init(const char *name, const char *spec)
 	/* look at each file */
 	while ((dent = readdir(dd)))
 	{
-	    if (*dent->d_name == '.')
-	    	continue;
-	    if (sscanf(dent->d_name, "%[^-]-%d.mf", metaname, &number) != 2)
-	    {
-	    	logf (LOG_DEBUG, "bf: %s is not a part-file.", dent->d_name);
-	    	continue;
-	    }
+	    int len = strlen(dent->d_name);
+	    const char *cp = strrchr (dent->d_name, '-');
+	    if (strchr (".-", *dent->d_name))
+		continue;
+	    if (len < 5 || !cp || strcmp (dent->d_name + len - 3, ".mf"))
+		continue;
+	    number = atoi(cp+1);
+	    memcpy (metaname, dent->d_name, cp - dent->d_name);
+	    metaname[ cp - dent->d_name] = '\0';
+
 	    for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
 	    {
 	    	/* known metafile */
@@ -355,6 +248,7 @@ MFile_area mf_init(const char *name, const char *spec)
                       dent->d_name);
 	    	return 0;
 	    }
+	    fsync(fd);
 	    close(fd);
 	    if (dirp->max_bytes >= 0)
 		dirp->avail_bytes -= part_f->bytes;
@@ -517,6 +411,7 @@ int mf_close(MFile mf)
     for (i = 0; i < mf->no_files; i++)
     	if (mf->files[i].fd >= 0)
     	{
+	    fsync(mf->files[i].fd);
     	    close(mf->files[i].fd);
     	    mf->files[i].fd = -1;
 	}
@@ -540,7 +435,10 @@ int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
             return 0;
 	}
         else
+        {
+            yaz_log (LOG_FATAL, "mf_read %s internal error", mf->name);
             exit(1);
+        }
     }
     toread = nbytes ? nbytes : mf->blocksize;
     if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
@@ -568,14 +466,18 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
 
     zebra_mutex_lock (&mf->mutex);
     if ((ps = file_position(mf, no, offset)) < 0)
+    {
+        yaz_log (LOG_FATAL, "mf_write %s internal error (1)", mf->name);
 	exit(1);
+    }
     /* file needs to grow */
     while (ps >= mf->files[mf->cur_file].blocks)
     {
+        off_t needed = (ps - mf->files[mf->cur_file].blocks + 1) *
+                       mf->blocksize;
     	/* 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 >
-	    mf->files[mf->cur_file].dir->avail_bytes)
+	    needed > mf->files[mf->cur_file].dir->avail_bytes)
 	{
 	    /* cap off file? */
 	    if ((nblocks = mf->files[mf->cur_file].dir->avail_bytes /
@@ -586,11 +488,16 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
 	    	if ((ps = file_position(mf,
 		    (mf->cur_file ? mf->files[mf->cur_file-1].top : 0) +
 		    mf->files[mf->cur_file].blocks + nblocks - 1, 0)) < 0)
-			exit(1);
+                {
+                    yaz_log (LOG_FATAL, "mf_write %s internal error (2)",
+				 mf->name);
+		    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");
+		    logf (LOG_ERRNO|LOG_FATAL, "mf_write %s internal error (3)",
+				      mf->name);
 		    exit(1);
 		}
 		mf->files[mf->cur_file].blocks += nblocks;
@@ -601,7 +508,7 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
 	    /* get other bit */
     	    logf (LOG_DEBUG, "Creating new file.");
     	    for (dp = mf->ma->dirs; dp && dp->max_bytes >= 0 &&
-		dp->avail_bytes < mf->min_bytes_creat; dp = dp->next);
+		dp->avail_bytes < needed; dp = dp->next);
 	    if (!dp)
 	    {
 	    	logf (LOG_FATAL, "Cannot allocate more space for %s",
@@ -624,7 +531,11 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
 	    mf->no_files++;
 	    /* open new file and position at beginning */
 	    if ((ps = file_position(mf, no, offset)) < 0)
+            {
+                yaz_log (LOG_FATAL, "mf_write %s internal error (4)",
+				 mf->name);
 	    	exit(1);
+            }	
 	}
 	else
 	{