X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fmfile.c;h=2f6500fc03e407ecffcdd4223477261f9f8b0596;hb=be6f4de56d3ab4fd49fbea540afe2580b947cded;hp=ecd795d6dd7931e1df8f44854d8f9952ac76a3d3;hpb=c4f5c81c1fef61826e2ca7815d5f427a0a82b8e7;p=idzebra-moved-to-github.git

diff --git a/bfile/mfile.c b/bfile/mfile.c
index ecd795d..2f6500f 100644
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -1,5 +1,5 @@
-/* $Id: mfile.c,v 1.61 2005-05-17 08:50:48 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: mfile.c,v 1.66 2006-06-07 10:14:39 adam Exp $
+   Copyright (C) 1995-2006
    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>
@@ -436,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++)
     {
@@ -603,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;
@@ -613,11 +616,34 @@ 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)
+    {
+        /* 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;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+