* Sebastian Hammer, Adam Dickmeiss
*
* $Log: mfile.c,v $
- * Revision 1.10 1995-09-04 12:33:22 adam
+ * Revision 1.16 1995-12-12 15:57:57 adam
+ * Implemented mf_unlink. cf_unlink uses mf_unlink.
+ *
+ * Revision 1.15 1995/12/08 16:21:14 adam
+ * Work on commit/update.
+ *
+ * Revision 1.14 1995/12/05 13:12:37 quinn
+ * Added <errno.h>
+ *
+ * Revision 1.13 1995/11/30 17:00:50 adam
+ * Several bug fixes. Commit system runs now.
+ *
+ * Revision 1.12 1995/11/24 17:26:11 quinn
+ * Mostly about making some ISAM stuff in the config file optional.
+ *
+ * Revision 1.11 1995/11/13 09:32:43 quinn
+ * Comment work.
+ *
+ * Revision 1.10 1995/09/04 12:33:22 adam
* Various cleanup. YAZ util used instead.
*
* Revision 1.9 1994/11/04 14:26:39 quinn
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
+#include <errno.h>
#include <alexutil.h>
#include <mfile.h>
static int scan_areadef(MFile_area ma, const char *name)
{
- const char *ad = res_get(common_resource, name);
+ /*
+ * If no definition is given, use current directory, unlimited.
+ */
+ const char *ad = res_get_def(common_resource, name, ".:-1b");
int offset = 0, rs, size, multi, rd;
char dirname[FILENAME_MAX+1], unit;
mf_dir **dp = &ma->dirs, *dir = *dp;
if (mf->files[c].fd < 0 && (mf->files[c].fd = open(mf->files[c].path,
mf->wr ? O_RDWR|O_CREAT : O_RDONLY, 0666)) < 0)
{
+ if (!mf->wr && errno == ENOENT && off == 0)
+ return -2;
logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", mf->files[c].path);
return -1;
}
logf (LOG_DEBUG, "mf_init(%s)", name);
for (mp = open_areas; mp; mp = mp->next)
if (!strcmp(name, mp->name))
- abort();
+ return mp;
+ ma = xmalloc(sizeof(MFile_area_struct));
strcpy(ma->name, name);
ma->next = open_areas;
open_areas = ma;
{
if (*dent->d_name == '.')
continue;
- if (sscanf(dent->d_name, "%[^.].%d", metaname, &number) != 2)
+ if (sscanf(dent->d_name, "%[^.].mf.%d", metaname, &number) != 2)
{
- logf (LOG_FATAL, "Failed to resolve part-name %s",
- dent->d_name);
- return 0;
+ logf (LOG_DEBUG, "bf: %s is not a part-file.", dent->d_name);
+ continue;
}
for (meta_f = ma->mfiles; meta_f; meta_f = meta_f->next)
{
return 0;
}
close(fd);
- dirp->avail_bytes -= part_f->bytes;
+ if (dirp->max_bytes >= 0)
+ dirp->avail_bytes -= part_f->bytes;
}
closedir(dd);
}
char tmp[FILENAME_MAX+1];
mf_dir *dp;
- logf(LOG_LOG, "mf_open(%s bs=%d, %s)", name, block_size,
+ logf(LOG_DEBUG, "mf_open(%s bs=%d, %s)", name, block_size,
wflag ? "RW" : "RDONLY");
if (!ma)
{
new->files[0].number = 0;
new->files[0].fd = -1;
new->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
- for (dp = ma->dirs; dp && dp->avail_bytes < new->min_bytes_creat;
- dp = dp->next);
+ for (dp = ma->dirs; dp && dp->max_bytes >= 0 && dp->avail_bytes <
+ new->min_bytes_creat; dp = dp->next);
if (!dp)
{
logf (LOG_FATAL, "Insufficient space for new mfile.");
return 0;
}
new->files[0].dir = dp;
- sprintf(tmp, "%s/%s.%d", dp->name, new->name, 0);
+ sprintf(tmp, "%s/%s.mf.%d", dp->name, new->name, 0);
new->files[0].path = xstrdup(tmp);
new->ma = ma;
}
{
int rd, toread;
- if (file_position(mf, no, offset) < 0)
- exit(1);
+ if ((rd = file_position(mf, no, offset)) < 0)
+ if (rd == -2)
+ return 0;
+ else
+ exit(1);
toread = num ? num : mf->blocksize;
if ((rd = read(mf->files[mf->cur_file].fd, buf, toread)) < 0)
{
{
logf (LOG_DEBUG, "File grows");
/* file overflow - allocate new file */
- if ((ps - mf->files[mf->cur_file].blocks + 1) * mf->blocksize >
+ if (mf->files[mf->cur_file].dir->max_bytes >= 0 &&
+ (ps - mf->files[mf->cur_file].blocks + 1) * mf->blocksize >
mf->files[mf->cur_file].dir->avail_bytes)
{
/* cap off file? */
}
/* get other bit */
logf (LOG_DEBUG, "Creating new file.");
- for (dp = mf->ma->dirs; dp && dp->avail_bytes < mf->min_bytes_creat;
- dp = dp->next);
+ for (dp = mf->ma->dirs; dp && dp->max_bytes >= 0 &&
+ dp->avail_bytes < mf->min_bytes_creat; dp = dp->next);
if (!dp)
{
logf (LOG_FATAL, "Cannot allocate more space for %s",
mf->files[mf->cur_file].blocks =
mf->files[mf->cur_file].bytes = 0;
mf->files[mf->cur_file].fd = -1;
- sprintf(tmp, "%s/%s.%d", dp->name, mf->name,
+ sprintf(tmp, "%s/%s.mf.%d", dp->name, mf->name,
mf->files[mf->cur_file].number);
mf->files[mf->cur_file].path = xstrdup(tmp);
mf->no_files++;
nblocks = ps - mf->files[mf->cur_file].blocks + 1;
mf->files[mf->cur_file].blocks += nblocks;
mf->files[mf->cur_file].bytes += nblocks * mf->blocksize;
- mf->files[mf->cur_file].dir->avail_bytes -= nblocks * mf->blocksize;
+ if (mf->files[mf->cur_file].dir->max_bytes >= 0)
+ mf->files[mf->cur_file].dir->avail_bytes -=
+ nblocks * mf->blocksize;
}
}
towrite = num ? num : mf->blocksize;
*/
int mf_unlink(MFile mf)
{
- abort();
+ int i;
+
+ for (i = 0; i < mf->no_files; i++)
+ unlink (mf->files[i].path);
return 0;
}