Added several type casts and changed many types - mostly from int to zint.

[idzebra-moved-to-github.git] / bfile / mfile.c

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 002a3f9..9ea9201 100644 (file)
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -1,5 +1,5 @@
-/* $Id: mfile.c,v 1.49 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: mfile.c,v 1.54 2004-08-06 12:28:22 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -60,7 +60,7 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base)
     {
         const char *ad0 = ad;
         int i = 0, fact = 1, multi;
-       off_t size = 0;
+       mfile_off_t size = 0;
 
         while (*ad == ' ' || *ad == '\t')
             ad++;
@@ -132,9 +132,10 @@ static int scan_areadef(MFile_area ma, const char *ad, const char *base)
     return 0;
 }
 
-static int file_position(MFile mf, int pos, int offset)
+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))
@@ -162,10 +163,13 @@ static int file_position(MFile mf, int pos, int offset)
             return -1;
         }
     }
-    if (lseek(mf->files[c].fd, (ps = pos - off) * mf->blocksize + offset,
+    ps = pos - off;
+    if (mfile_seek(mf->files[c].fd, ps * (mfile_off_t) mf->blocksize + offset,
        SEEK_SET) < 0)
     {
        logf (LOG_WARN|LOG_ERRNO, "Failed to seek in %s", mf->files[c].path);
+        logf(LOG_WARN, "pos=" ZINT_FORMAT " off=" ZINT_FORMAT " blocksize=%d offset=%d",
+                       pos, off, mf->blocksize, offset);
        return -1;
     }
     mf->cur_file = c;
@@ -174,7 +178,12 @@ static int file_position(MFile mf, int pos, int offset)
 
 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;
 }
 
 /*
@@ -241,6 +250,7 @@ MFile_area mf_init(const char *name, const char *spec, const char *base)
                meta_f->next = ma->mfiles;
                meta_f->open = 0;
                meta_f->cur_file = -1;
+                meta_f->unlink_flag = 0;
                ma->mfiles = meta_f;
                strcpy(meta_f->name, metaname);
                part_f = &meta_f->files[0];
@@ -258,7 +268,7 @@ MFile_area mf_init(const char *name, const char *spec, const char *base)
                       dent->d_name);
                return 0;
            }
-           if ((part_f->bytes = lseek(fd, 0, SEEK_END)) < 0)
+           if ((part_f->bytes = mfile_seek(fd, 0, SEEK_END)) < 0)
            {
                logf (LOG_FATAL|LOG_ERRNO, "Failed to seek in %s",
                       dent->d_name);
@@ -372,6 +382,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
        mnew->files[0].top = -1;
        mnew->files[0].number = 0;
        mnew->files[0].fd = -1;
+        mnew->unlink_flag = 0;
        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);
@@ -394,7 +405,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
            if (mnew->files[i].bytes % block_size)
                mnew->files[i].bytes += block_size - mnew->files[i].bytes %
                    block_size;
-           mnew->files[i].blocks = mnew->files[i].bytes / block_size;
+           mnew->files[i].blocks = (int) (mnew->files[i].bytes / block_size);
        }
        assert(!mnew->open);
     }
@@ -406,7 +417,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
 
     for (i = 0; i < mnew->no_files; i++)
     {
-       mnew->files[i].blocks = mnew->files[i].bytes / mnew->blocksize;
+       mnew->files[i].blocks = (int)(mnew->files[i].bytes / mnew->blocksize);
        if (i == mnew->no_files - 1)
            mnew->files[i].top = -1;
        else
@@ -427,6 +438,7 @@ int mf_close(MFile mf)
     logf (LOG_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
@@ -435,6 +447,9 @@ int mf_close(MFile mf)
            close(mf->files[i].fd);
            mf->files[i].fd = -1;
        }
+        if (mf->unlink_flag)
+            unlink(mf->files[i].path);
+    }
     mf->open = 0;
     return 0;
 }
@@ -442,9 +457,10 @@ 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)
 {
-    int rd, toread;
+    zint rd;
+    int toread;
 
     zebra_mutex_lock (&mf->mutex);
     if ((rd = file_position(mf, no, offset)) < 0)
@@ -477,9 +493,11 @@ int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
 /*
  * Write.
  */
-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)
 {
-    int ps, nblocks, towrite;
+    zint ps;
+    zint nblocks;
+    int towrite;
     mf_dir *dp;
     char tmp[FILENAME_MAX+1];
     unsigned char dummych = '\xff';
@@ -493,15 +511,15 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
     /* file needs to grow */
     while (ps >= mf->files[mf->cur_file].blocks)
     {
-        off_t needed = (ps - mf->files[mf->cur_file].blocks + 1) *
+        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 = mf->files[mf->cur_file].dir->avail_bytes /
-               mf->blocksize) > 0)
+           if ((nblocks = (int) (mf->files[mf->cur_file].dir->avail_bytes /
+               mf->blocksize)) > 0)
            {
                logf (LOG_DEBUG, "Capping off file %s at pos %d",
                    mf->files[mf->cur_file].path, nblocks);
@@ -542,10 +560,10 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
            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.mf", 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++;
@@ -583,10 +601,14 @@ int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
  */
 int mf_unlink(MFile mf)
 {
-    int i;
-
-    for (i = 0; i < mf->no_files; i++)
-        unlink (mf->files[i].path);
+    if (mf->open)
+        mf->unlink_flag = 1;
+    else
+    {
+        int i;
+        for (i = 0; i<mf->no_files; i++)
+            unlink(mf->files[i].path);
+    }
     return 0;
 }