-/* $Id: mfile.c,v 1.50 2003-02-28 15:28:36 adam Exp $
+/* $Id: mfile.c,v 1.52 2003-04-05 12:32:34 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
return -1;
}
}
- if (mfile_seek(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=%d off=%d blocksize=%d offset=%d",
+ pos, off, mf->blocksize, offset);
return -1;
}
mf->cur_file = c;
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];
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);
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
close(mf->files[i].fd);
mf->files[i].fd = -1;
}
+ if (mf->unlink_flag)
+ unlink(mf->files[i].path);
+ }
mf->open = 0;
return 0;
}
*/
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;
}