X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fmfile.c;h=b5b125e9b2fdccf2005f238c4eb4224d5f4e7e86;hp=3f673aa15f6bcbffcbbc74032b38b364292a137f;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=05b9b8ed020c5bfa48a913d6a2e2b50ddf1bab8e

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 3f673aa..b5b125e 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -1,6 +1,6 @@
-/* $Id: mfile.c,v 1.57 2004-12-08 12:23:08 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
-   Index Data Aps
+/* $Id: mfile.c,v 1.65 2006-05-10 08:13:17 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -32,7 +32,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <fcntl.h>
 #ifdef WIN32
 #include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <direntz.h>
@@ -43,7 +44,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <errno.h>
 
 #include <zebra-lock.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
+#include <yaz/yaz-util.h>
 #include "mfile.h"
 
 static int scan_areadef(MFile_area ma, const char *ad, const char *base)
@@ -160,7 +162,7 @@ static zint file_position(MFile mf, zint pos, int offset)
             if (!mf->wr && errno == ENOENT && off == 0)
                 return -2;
     	    yaz_log (YLOG_WARN|YLOG_ERRNO, "Failed to open %s", mf->files[c].path);
-    	     return -1;
+	    return -1;
         }
     }
     ps = pos - off;
@@ -435,7 +437,7 @@ int mf_close(MFile mf)
 {
     int i;
 
-    yaz_log (YLOG_DEBUG, "mf_close(%s)", mf->name);
+    yaz_log (YLOG_DEBUG, "mf_close(%s) unlink=%d", mf->name, mf->unlink_flag);
     assert(mf->open);
     for (i = 0; i < mf->no_files; i++)
     {
@@ -602,7 +604,9 @@ int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf)
 int mf_unlink(MFile mf)
 {
     if (mf->open)
+    {
         mf->unlink_flag = 1;
+    }
     else
     {
         int i;
@@ -612,11 +616,28 @@ int mf_unlink(MFile mf)
     return 0;
 }
 
-/*
- * Unlink the file by name, rather than MFile-handle. File should be closed.
- */
-int mf_unlink_name(MFile_area ma, const char *name)
+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)
+	*max_bytes = d->max_bytes;
+    if (used_bytes)
+	*used_bytes = d->max_bytes - d->avail_bytes;
+    return 1;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+