X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fmfile.c;h=674687afb0ad8f2bede38ae3728b56a933ab4c54;hp=ab74d4f130757c4d0b21122cec8c963e77e422ac;hb=a5c8c78e8671af863fc61b2ad8b24f92f827f7b2;hpb=578dd70f12b83f52068e882335c322ddb9ebe2dc

diff --git a/bfile/mfile.c b/bfile/mfile.c
index ab74d4f..674687a 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -1,80 +1,150 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: mfile.c,v $
- * 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.
- *
- */
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <fcntl.h>
+#ifdef WIN32
+#include <io.h>
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
-#include <dirent.h>
+#endif
+#include <direntz.h>
+#include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <assert.h>
+#include <errno.h>
 
-#include <util.h>
-#include <mfile.h>
-
-static MFile_area_struct *open_areas = 0;
-static MFile_area_struct *default_area = 0;
+#include <zebra-lock.h>
+#include <idzebra/util.h>
+#include <yaz/yaz-util.h>
+#include "mfile.h"
 
-static int scan_areadef(MFile_area ma, const char *name)
+static int scan_areadef(MFile_area ma, const char *ad, const char *base)
 {
-    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.
+     */
+    char dirname[FILENAME_MAX+1]; 
     mf_dir **dp = &ma->dirs, *dir = *dp;
 
     if (!ad)
-    {
-    	log(LOG_FATAL, "Could not find resource '%s'", name);
-    	return -1;
-    }
+        ad = ".:-1b";
     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;
+	mfile_off_t size = 0;
+
+        while (*ad == ' ' || *ad == '\t')
+            ad++;
+        if (!*ad)
+            break;
+        if (!yaz_is_abspath(ad) && base)
         {
-	    log(LOG_FATAL, "Illegal directory description: %s", ad + offset);
-	    return -1;
-	}
-	switch (unit)
+            strcpy(dirname, base);
+            i = strlen(dirname);
+            dirname[i++] = '/';
+        }
+        while (*ad)
+        {
+	    if (*ad == ':' && strchr("+-0123456789", ad[1]))
+		break;
+            if (i < FILENAME_MAX)
+                dirname[i++] = *ad;
+            ad++;
+        }
+        dirname[i] = '\0';
+        if (*ad++ != ':')
+        {
+	    yaz_log(YLOG_WARN, "Missing colon after path: %s", ad0);
+            return -1;
+        }
+        if (i == 0)
+        {
+	    yaz_log(YLOG_WARN, "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')
+        {
+	    yaz_log(YLOG_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;
-	    default:
-	        log(LOG_FATAL, "Illegal unit: %c in %s", unit, ad + offset);
-	        return -1;
+	case 'B': case 'b': multi = 1; break;
+	case 'K': case 'k': multi = 1024; break;
+	case 'M': case 'm': multi = 1048576; break;
+	case 'G': case 'g': multi = 1073741824; break;
+        case '\0':
+            yaz_log(YLOG_FATAL, "Missing unit: %s", ad0);
+            return -1;
+        default:
+            yaz_log(YLOG_FATAL, "Illegal unit: %c in %s", *ad, ad0);
+            return -1;
 	}
-	*dp = dir = xmalloc(sizeof(mf_dir));
+        ad++;
+	*dp = dir = (mf_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;
 }
 
-static int file_position(MFile mf, int pos)
+/** \brief position within metafile (perform seek)
+    \param mf metafile handle
+    \param pos block position
+    \param offset offset within block
+    \retval 0 OK
+    \retval -1 ERROR
+    \retval -2 OK, but file does not created (read-only)
+*/
+   
+static zint file_position(MFile mf, zint pos, int offset)
 {
-    int off = 0, c = mf->cur_file, ps;
+    zint off = 0, ps;
+    int c = mf->cur_file;
 
     if ((c > 0 && pos <= mf->files[c-1].top) ||
 	(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++;
@@ -83,15 +153,29 @@ static int file_position(MFile mf, int pos)
     }
     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_RDWR|O_CREAT : O_RDONLY, 0666)) < 0)
+    if (mf->files[c].fd < 0)
     {
-    	log(LOG_FATAL|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)
+            {
+                /* we can't open it for reading. But not really an error */
+                return -2;
+            }
+    	    yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to open %s", mf->files[c].path);
+	    return -1;
+        }
     }
-    if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize, SEEK_SET) < 0)
+    ps = pos - off;
+    if (mfile_seek(mf->files[c].fd, ps *(mfile_off_t) mf->blocksize + offset,
+    	SEEK_SET) < 0)
     {
-    	log(LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
+    	yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
+        yaz_log(YLOG_WARN, "pos=" ZINT_FORMAT " off=" ZINT_FORMAT " blocksize=%d offset=%d",
+                       pos, off, mf->blocksize, offset);
     	return -1;
     }
     mf->cur_file = c;
@@ -100,35 +184,34 @@ static int file_position(MFile mf, int pos)
 
 static int cmp_part_file(const void *p1, const void *p2)
 {
-    return ((part_file *)p1)->number - ((part_file *)p2)->number;
+    zint d = ((part_file *)p1)->number - ((part_file *)p2)->number;
+    if (d > 0)
+        return 1;
+    if (d < 0)
+	return -1;
+    return 0;
 }
 
-/*
- * 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)
+MFile_area mf_init(const char *name, const char *spec, const char *base,
+                   int only_shadow_files)
 {
-    MFile_area ma = xmalloc(sizeof(MFile_area_struct)), mp;
+    MFile_area ma = (MFile_area) xmalloc(sizeof(*ma));
     mf_dir *dirp;
     meta_file *meta_f;
-    part_file *part_f;
+    part_file *part_f = 0;
     DIR *dd;
     struct dirent *dent;
     int fd, number;
     char metaname[FILENAME_MAX+1], tmpnam[FILENAME_MAX+1];
-
-    for (mp = open_areas; mp; mp = mp->next)
-    	if (!strcmp(name, mp->name))
-    	    abort();
+    
+    yaz_log(YLOG_DEBUG, "mf_init(%s)", name);
     strcpy(ma->name, name);
-    ma->next = open_areas;
-    open_areas = ma;
     ma->mfiles = 0;
     ma->dirs = 0;
-    if (scan_areadef(ma, name) < 0)
+    if (scan_areadef(ma, spec, base) < 0)
     {
-    	log(LOG_FATAL, "Failed to access description of '%s'", name);
+    	yaz_log(YLOG_WARN, "Failed to access description of '%s'", name);
+        mf_destroy(ma);
     	return 0;
     }
     /* look at each directory */
@@ -136,19 +219,29 @@ MFile_area mf_init(const char *name)
     {
     	if (!(dd = opendir(dirp->name)))
     	{
-    	    log(LOG_FATAL|LOG_ERRNO, "Failed to open %s", dirp->name);
+    	    yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to open directory %s",
+                    dirp->name);
+            mf_destroy(ma);
     	    return 0;
 	}
 	/* look at each file */
 	while ((dent = readdir(dd)))
 	{
-	    if (*dent->d_name == '.')
-	    	continue;
-	    if (sscanf(dent->d_name, "%[^.].%d", metaname, &number) != 2)
-	    {
-	    	log(LOG_FATAL, "Failed to resolve part-name %s", dent->d_name);
-	    	return 0;
-	    }
+	    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';
+
+            /* only files such as file-i-0.mf and file-i-b-0.mf, bug #739 */
+            if (only_shadow_files && cp[-2] != '-')
+                continue;
+            if (!only_shadow_files && cp[-2] == '-')
+                continue;
 	    for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
 	    {
 	    	/* known metafile */
@@ -161,7 +254,8 @@ MFile_area mf_init(const char *name)
 	    /* new metafile */
 	    if (!meta_f)
 	    {
-	    	meta_f = xmalloc(sizeof(*meta_f));
+	    	meta_f = (meta_file *) xmalloc(sizeof(*meta_f));
+        	zebra_mutex_init(&meta_f->mutex);
 	    	meta_f->ma = ma;
 	    	meta_f->next = ma->mfiles;
 	    	meta_f->open = 0;
@@ -177,202 +271,370 @@ MFile_area mf_init(const char *name)
 	    sprintf(tmpnam, "%s/%s", dirp->name, dent->d_name);
 	    part_f->path = xstrdup(tmpnam);
 	    /* get size */
-	    if ((fd = open(part_f->path, O_RDONLY)) < 0)
+	    if ((fd = open(part_f->path, O_BINARY|O_RDONLY)) < 0)
 	    {
-	    	log(LOG_FATAL|LOG_ERRNO, "Failed to access %s", dent->d_name);
+	    	yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to access %s",
+                      dent->d_name);
+                closedir(dd);
+                mf_destroy(ma);
 	    	return 0;
 	    }
-	    if ((part_f->bytes = lseek(fd, 0, SEEK_END)) < 0)
+	    if ((part_f->bytes = mfile_seek(fd, 0, SEEK_END)) < 0)
 	    {
-	    	log(LOG_FATAL|LOG_ERRNO, "Failed to seek in %s", dent->d_name);
+	    	yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to seek in %s",
+                      dent->d_name);
+                close(fd);
+                closedir(dd);
+                mf_destroy(ma);
 	    	return 0;
 	    }
 	    close(fd);
-	    dirp->avail_bytes -= part_f->bytes;
+	    if (dirp->max_bytes >= 0)
+		dirp->avail_bytes -= part_f->bytes;
 	}
 	closedir(dd);
     }
     for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
     {
-    	log(LOG_DEBUG, "mf_init: %s consists of %d part(s)", meta_f->name,
-    	    meta_f->no_files);
+    	yaz_log(YLOG_DEBUG, "mf_init: %s consists of %d part(s)", meta_f->name,
+              meta_f->no_files);
     	qsort(meta_f->files, meta_f->no_files, sizeof(part_file),
-    	    cmp_part_file);
+              cmp_part_file);
     }
     return ma;
 }
 
-/*
- * Open a metafile.
- * If !ma, Use MF_DEFAULT_AREA.
- */
-MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
+void mf_destroy(MFile_area ma)
 {
-    struct meta_file *new;
-    int i;
-    char tmp[FILENAME_MAX+1];
     mf_dir *dp;
 
     if (!ma)
+	return;
+    dp = ma->dirs;
+    while (dp)
     {
-        if (!default_area && !(default_area = mf_init(MF_DEFAULT_AREA)))
-        {
-            log(LOG_FATAL, "Failed to open default area.");
-            return 0;
+	mf_dir *d = dp;
+	dp = dp->next;
+	xfree(d);
+    }
+    mf_reset(ma, 0);
+    xfree(ma);
+}
+
+void mf_reset(MFile_area ma, int unlink_flag)
+{
+    meta_file *meta_f;
+
+    if (!ma)
+	return;
+    meta_f = ma->mfiles;
+    while (meta_f)
+    {
+	int i;
+	meta_file *m = meta_f;
+
+	meta_f = meta_f->next;
+
+	assert(!m->open);
+	for (i = 0; i<m->no_files; i++)
+	{
+            if (unlink_flag)
+                unlink(m->files[i].path);
+	    xfree(m->files[i].path);
 	}
-	ma = default_area;
+	zebra_mutex_destroy(&m->mutex);
+	xfree(m);
     }
-    for (new = ma->mfiles; new; new = new->next)
-    	if (!strcmp(name, new->name))
-    	    if (new->open)
-    	        abort();
-	    else
-	        break;
-    if (!new)
+    ma->mfiles = 0;
+}
+
+MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
+{
+    meta_file *mnew;
+    int i;
+    char tmp[FILENAME_MAX+1];
+    mf_dir *dp;
+
+    yaz_log(YLOG_DEBUG, "mf_open(%s bs=%d, %s)", name, block_size,
+         wflag ? "RW" : "RDONLY");
+    assert(ma);
+    for (mnew = ma->mfiles; mnew; mnew = mnew->next)
+    	if (!strcmp(name, mnew->name))
+	{
+    	    if (mnew->open)
+            {
+                yaz_log(YLOG_WARN, "metafile %s already open", name);
+                return 0;
+            }
+            break;
+	}
+    if (!mnew)
     {
-    	new = xmalloc(sizeof(*new));
-    	strcpy(new->name, name);
+    	mnew = (meta_file *) xmalloc(sizeof(*mnew));
+    	strcpy(mnew->name, name);
     	/* allocate one, empty file */
-    	new->no_files = 1;
-    	new->files[0].bytes = new->files[0].blocks = 0;
-    	new->files[0].top = -1;
-    	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);
+	zebra_mutex_init(&mnew->mutex);
+    	mnew->no_files = 1;
+    	mnew->files[0].bytes = 0;
+	mnew->files[0].blocks = 0;
+    	mnew->files[0].top = -1;
+    	mnew->files[0].number = 0;
+    	mnew->files[0].fd = -1;
+    	mnew->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
+    	for (dp = ma->dirs; dp && dp->max_bytes >= 0 && dp->avail_bytes <
+	    mnew->min_bytes_creat; dp = dp->next);
 	if (!dp)
 	{
-	    log(LOG_FATAL, "Insufficient space for new mfile.");
+	    yaz_log(YLOG_FATAL, "Insufficient space for file %s", name);
+            xfree(mnew);
 	    return 0;
 	}
-	new->files[0].dir = dp;
-    	sprintf(tmp, "%s/%s.%d", dp->name, new->name, 0);
-    	new->files[0].path = xstrdup(tmp);
-    	new->ma = ma;
+	mnew->files[0].dir = dp;
+    	sprintf(tmp, "%s/%s-%d.mf", dp->name, mnew->name, 0);
+    	mnew->files[0].path = xstrdup(tmp);
+    	mnew->ma = ma;
+	mnew->next = ma->mfiles;
+	ma->mfiles = mnew;
     }
     else
     {
-    	assert(!new->open);
+    	for (i = 0; i < mnew->no_files; i++)
+    	{
+	    if (mnew->files[i].bytes % block_size)
+	    	mnew->files[i].bytes += block_size - mnew->files[i].bytes %
+		    block_size;
+	    mnew->files[i].blocks = (int) (mnew->files[i].bytes / block_size);
+	}
+    	assert(!mnew->open);
     }
-    new->blocksize = block_size;
-    new->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
-    new->wr=wflag;
-    new->cur_file = 0;
-    new->open = 1;
+    mnew->blocksize = block_size;
+    mnew->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
+    mnew->wr=wflag;
+    mnew->cur_file = 0;
+    mnew->open = 1;
 
-    for (i = 0; i < new->no_files; i++)
+    for (i = 0; i < mnew->no_files; i++)
     {
-    	new->files[i].blocks = new->files[i].bytes / new->blocksize;
-    	if (i == new->no_files)
-	    new->files[i].top = -1;
+    	mnew->files[i].blocks = (int)(mnew->files[i].bytes / mnew->blocksize);
+    	if (i == mnew->no_files - 1)
+	    mnew->files[i].top = -1;
 	else
-	    new->files[i].top = i ? (new->files[i-1].top + new->files[i].blocks)
-	        : (new->files[i].blocks - 1);
+	    mnew->files[i].top =
+		i ? (mnew->files[i-1].top + mnew->files[i].blocks)
+	        : (mnew->files[i].blocks - 1);
     }
-    return new;
+    return mnew;
 }
 
-/*
- * Close a metafile.
- */
 int mf_close(MFile mf)
 {
     int i;
 
+    yaz_log(YLOG_DEBUG, "mf_close(%s)", mf->name);
     assert(mf->open);
     for (i = 0; i < mf->no_files; i++)
+    {
     	if (mf->files[i].fd >= 0)
+    	{
+#ifndef WIN32
+            if (mf->wr)
+                fsync(mf->files[i].fd);
+#endif
     	    close(mf->files[i].fd);
+    	    mf->files[i].fd = -1;
+	}
+    }
     mf->open = 0;
     return 0;
 }
 
-/*
- * Read one block from a metafile. Interface mirrors bfile.
- */
-int mf_read(MFile mf, int no, int offset, int num, void *buf)
+int mf_read(MFile mf, zint no, int offset, int nbytes, void *buf)
 {
-    if (file_position(mf, no) < 0)
-    	exit(1);
-    if (read(mf->files[mf->cur_file].fd, buf, mf->blocksize) < mf->blocksize)
+    zint rd;
+    int toread;
+
+    zebra_mutex_lock(&mf->mutex);
+    if ((rd = file_position(mf, no, offset)) < 0)
     {
-    	log(LOG_FATAL|LOG_ERRNO, "Read failed");
-    	exit(1);
+        if (rd == -2)
+	{
+	    zebra_mutex_unlock(&mf->mutex);
+            return 0;
+	}
+        else
+        {
+            yaz_log(YLOG_FATAL, "mf_read2 %s internal error", mf->name);
+            return -1;
+        }
     }
-    return 0;
+    toread = nbytes ? nbytes : mf->blocksize;
+    if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
+    {
+    	yaz_log(YLOG_FATAL|YLOG_ERRNO, "mf_read2: Read failed (%s)",
+              mf->files[mf->cur_file].path);
+        return -1;
+    }
+    zebra_mutex_unlock(&mf->mutex);
+    if (rd < toread)
+    	return 0;
+    else
+    	return 1;
 }
 
-/*
- * Write.
- */
-int mf_write(MFile mf, int no, int offset, int num, const void *buf)
+int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf)
 {
-    int ps;
+    int ret = 0;
+    zint ps;
+    zint nblocks;
+    int towrite;
     mf_dir *dp;
     char tmp[FILENAME_MAX+1];
+    unsigned char dummych = '\xff';
 
-    if ((ps = file_position(mf, no)) < 0)
-	exit(1);
-    assert(ps <= mf->files[mf->cur_file].blocks);
-    /* extend table */
-    if (ps == mf->files[mf->cur_file].blocks)
+    zebra_mutex_lock(&mf->mutex);
+    if ((ps = file_position(mf, no, offset)) < 0)
     {
-    	assert(mf->cur_file == mf->no_files - 1);
-    	/* create new file */
-    	if (mf->files[mf->cur_file].dir->avail_bytes <
-	    mf->blocksize)
-    	{
-    	    log(LOG_DEBUG, "Creating new file.");
-    	    for (dp = mf->ma->dirs; dp && dp->avail_bytes < mf->min_bytes_creat;
-		dp = dp->next);
+        yaz_log(YLOG_FATAL, "mf_write: %s error (1)", mf->name);
+        ret = -1;
+        goto out;
+    }
+    /* file needs to grow */
+    while (ps >= mf->files[mf->cur_file].blocks)
+    {
+        mfile_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 &&
+	    needed > mf->files[mf->cur_file].dir->avail_bytes)
+	{
+	    /* cap off file? */
+	    if ((nblocks = (int) (mf->files[mf->cur_file].dir->avail_bytes /
+		mf->blocksize)) > 0)
+	    {
+	    	yaz_log(YLOG_DEBUG, "Capping off file %s at pos " ZINT_FORMAT,
+		    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 - 1, 0)) < 0)
+                {
+                    yaz_log(YLOG_FATAL, "mf_write: %s error (2)",
+				 mf->name);
+                    ret = -1;
+                    goto out;
+                }
+		yaz_log(YLOG_DEBUG, "ps = " ZINT_FORMAT, ps);
+		if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1)
+		{
+		    yaz_log(YLOG_ERRNO|YLOG_FATAL, "mf_write: %s error (3)",
+				      mf->name);
+                    ret = -1;
+                    goto out;
+		}
+		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;
+	    }
+	    /* get other bit */
+    	    yaz_log(YLOG_DEBUG, "Creating new file.");
+    	    for (dp = mf->ma->dirs; dp && dp->max_bytes >= 0 &&
+		dp->avail_bytes < needed; dp = dp->next);
 	    if (!dp)
 	    {
-	    	log(LOG_FATAL, "Cannot allocate more space for %s", mf->name);
-	    	exit(1);
+	    	yaz_log(YLOG_FATAL, "mf_write: %s error (4) no more space",
+                        mf->name);
+    	        for (dp = mf->ma->dirs; dp ; dp = dp->next) {
+                    yaz_log(YLOG_FATAL,"%s: max=" ZINT_FORMAT 
+                           " used=" ZINT_FORMAT " available=" ZINT_FORMAT, 
+                        dp->name, (zint)dp->max_bytes, 
+                        (zint)(dp->max_bytes - dp->avail_bytes), (zint)dp->avail_bytes );
+                }
+                yaz_log(YLOG_FATAL,"Adjust the limits in your zebra.cfg");
+                ret = -1;
+                goto out;
 	    }
-	    mf->files[mf->cur_file].top = no - 1;
+	    mf->files[mf->cur_file].top = (mf->cur_file ?
+                                           mf->files[mf->cur_file-1].top : -1) +
+		mf->files[mf->cur_file].blocks;
 	    mf->files[++(mf->cur_file)].top = -1;
 	    mf->files[mf->cur_file].dir = dp;
 	    mf->files[mf->cur_file].number =
 		mf->files[mf->cur_file-1].number + 1;
-	    mf->files[mf->cur_file].blocks =
-	    	mf->files[mf->cur_file].bytes = 0;
+	    mf->files[mf->cur_file].blocks = 0;
+	    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-" ZINT_FORMAT ".mf", dp->name, mf->name,
 		mf->files[mf->cur_file].number);
 	    mf->files[mf->cur_file].path = xstrdup(tmp);
 	    mf->no_files++;
 	    /* open new file and position at beginning */
-	    if (file_position(mf, no) < 0)
-	    	exit(1);
+	    if ((ps = file_position(mf, no, offset)) < 0)
+            {
+                yaz_log(YLOG_FATAL, "mf_write: %s error (5)", mf->name);
+                ret = -1;
+                goto out;
+            }	
+	}
+	else
+	{
+	    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;
+	    if (mf->files[mf->cur_file].dir->max_bytes >= 0)
+		mf->files[mf->cur_file].dir->avail_bytes -=
+		nblocks * mf->blocksize;
 	}
-	mf->files[mf->cur_file].blocks++;
-	mf->files[mf->cur_file].bytes += mf->blocksize;
-	mf->files[mf->cur_file].dir->avail_bytes -= mf->blocksize;
     }
-    if (write(mf->files[mf->cur_file].fd, buf, mf->blocksize) < mf->blocksize)
+    towrite = nbytes ? nbytes : mf->blocksize;
+    if (write(mf->files[mf->cur_file].fd, buf, towrite) < towrite)
     {
-    	log(LOG_FATAL|LOG_ERRNO, "Write failed");
-    	exit(1);
+    	yaz_log(YLOG_FATAL|YLOG_ERRNO, "Write failed for file %s part %d",
+		mf->name, mf->cur_file);
+        ret = -1;
     }
-    return 0;
+ out:
+    zebra_mutex_unlock(&mf->mutex);
+    return ret;
 }
 
-/*
- * Destroy a metafile, unlinking component files. File must be open.
- */
-int mf_unlink(MFile mf)
+/** \brief metafile area statistics 
+    \param ma metafile area handle
+    \param no area number (0=first, 1=second, ..)
+    \param directory holds directory upon completion (if non-NULL)
+    \param used_bytes holds used bytes upon completion (if non-NULL)
+    \param max_bytes holds max size bytes upon completion (if non-NULL)
+    \retval 0 area number does not exist
+    \retval 1 area number exists (and directory,used_bytes,.. are set)
+*/
+int mf_area_directory_stat(MFile_area ma, int no, const char **directory,
+			   double *used_bytes, double *max_bytes)
 {
-    abort();
-    return 0;
+    int i;
+    mf_dir *d = ma->dirs;
+    for (i = 0; d && i<no; i++, d = d->next)
+	;
+    if (!d)
+	return 0;
+    if (directory)
+	*directory = d->name;
+    if (max_bytes)
+    {
+        /* possible loss of data. But it's just statistics and lies */
+	*max_bytes = (double) d->max_bytes;
+    }
+    if (used_bytes)
+    {
+        /* possible loss of data. But it's just statistics and lies */
+	*used_bytes = (double) (d->max_bytes - d->avail_bytes);
+    }
+    return 1;
 }
-
 /*
- * Unlink the file by name, rather than MFile-handle. File should be closed.
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
  */
-int mf_unlink_name(MFile_area ma, const char *name)
-{
-    abort();
-    return 0;
-}
+