X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fmfile.h;h=7c0ab1fc72763b81ee62c54e0860fb9b972fcd25;hb=7c3a0352f0492609a3b6b26b63a72b0b2d207aab;hp=31c79051109f6096e2825a761a8aadc68ed0626a;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/include/mfile.h b/include/mfile.h
index 31c7905..7c0ab1f 100644
--- a/include/mfile.h
+++ b/include/mfile.h
@@ -1,5 +1,5 @@
-/* $Id: mfile.h,v 1.18 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: mfile.h,v 1.23 2004-08-25 09:23:35 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -27,11 +27,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <stdio.h>
 #include <yaz/yconfig.h>
+#include <idzebra/version.h>
 
 #ifdef WIN32
-typedef long off_t;
+
+/* 64-bit access .. */
+typedef __int64 mfile_off_t;
+#define mfile_seek _lseeki64
+
 #else
 #include <sys/types.h>
+typedef off_t mfile_off_t;
+#define mfile_seek lseek
 #endif
 
 #ifndef FILENAME_MAX
@@ -52,17 +59,17 @@ YAZ_BEGIN_CDECL
 typedef struct mf_dir
 {
     char name[FILENAME_MAX+1];
-    off_t max_bytes;      /* allocated bytes in this dir. */
-    off_t avail_bytes;    /* bytes left */
+    mfile_off_t max_bytes;      /* allocated bytes in this dir. */
+    mfile_off_t avail_bytes;    /* bytes left */
     struct mf_dir *next;
 } mf_dir;
 
 typedef struct part_file
 {
-    int number;
-    int top;
-    int blocks;
-    off_t bytes;
+    zint number;
+    zint top;
+    zint blocks;
+    mfile_off_t bytes;
     mf_dir *dir;
     char *path;
     int fd;
@@ -78,8 +85,9 @@ typedef struct meta_file
     int no_files;
     int cur_file;
     int open;                          /* is this file open? */
-    off_t blocksize;
-    off_t min_bytes_creat;  /* minimum bytes required to enter directory */
+    int unlink_flag;
+    int blocksize;
+    mfile_off_t min_bytes_creat;  /* minimum bytes required to enter directory */
     MFile_area ma;
     int wr;
     Zebra_mutex mutex;
@@ -119,12 +127,12 @@ int mf_close(MFile mf);
 /*
  * Read one block from a metafile. Interface mirrors bfile.
  */
-int mf_read(MFile mf, int no, int offset, int nbytes, void *buf);
+int mf_read(MFile mf, zint no, int offset, int nbytes, void *buf);
 
 /*
  * Same.
  */
-int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf);
+int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf);
 
 /*
  * Destroy a metafile, unlinking component files. File must be open.