/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1997, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: mfile.c,v $
- * Revision 1.20 1996-05-14 12:10:16 quinn
+ * Revision 1.26 1997-10-27 14:25:38 adam
+ * Fixed memory leaks.
+ *
+ * Revision 1.25 1997/09/18 08:59:16 adam
+ * Extra generic handle for the character mapping routines.
+ *
+ * Revision 1.24 1997/09/17 12:19:06 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.23 1997/09/09 13:37:53 adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.22 1997/09/04 13:56:39 adam
+ * Added O_BINARY to open calls.
+ *
+ * Revision 1.21 1996/10/29 13:56:18 adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.20 1996/05/14 12:10:16 quinn
* Bad areadef scan
*
* Revision 1.19 1996/05/01 07:16:30 quinn
#include <sys/types.h>
#include <fcntl.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
#include <unistd.h>
-#include <dirent.h>
+#endif
+#include <direntz.h>
+#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
-#include <alexutil.h>
+#include <zebrautl.h>
#include <mfile.h>
-static MFile_area_struct *open_areas = 0;
-static MFile_area_struct *default_area = 0;
-
-static int scan_areadef(MFile_area ma, const char *name)
+static int scan_areadef(MFile_area ma, const char *name, const char *ad)
{
/*
* If no definition is given, use current directory, unlimited.
*/
- const char *ad = res_get_def(common_resource, name, ".:-1b");
char dirname[FILENAME_MAX+1];
mf_dir **dp = &ma->dirs, *dir = *dp;
if (!ad)
- {
- logf (LOG_FATAL, "Could not find resource '%s'", name);
- return -1;
- }
+ ad = ".:-1b";
for (;;)
{
const char *ad0 = ad;
else
off = c ? (mf->files[c-1].top + 1) : 0;
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)
+ mf->wr ? (O_BINARY|O_RDWR|O_CREAT) : (O_BINARY|O_RDONLY), 0666)) < 0)
{
if (!mf->wr && errno == ENOENT && off == 0)
return -2;
* Create a new area, cotaining metafiles in directories.
* Find the part-files in each directory, and inventory the existing metafiles.
*/
-MFile_area mf_init(const char *name)
+MFile_area mf_init(const char *name, const char *spec)
{
- MFile_area ma = xmalloc(sizeof(MFile_area_struct)), mp;
+ MFile_area ma = xmalloc(sizeof(*ma));
mf_dir *dirp;
meta_file *meta_f;
part_file *part_f = 0;
struct dirent *dent;
int fd, number;
char metaname[FILENAME_MAX+1], tmpnam[FILENAME_MAX+1];
-
+
logf (LOG_DEBUG, "mf_init(%s)", name);
- for (mp = open_areas; mp; mp = mp->next)
- if (!strcmp(name, mp->name))
- return mp;
- ma = xmalloc(sizeof(MFile_area_struct));
strcpy(ma->name, name);
- ma->next = open_areas;
- open_areas = ma;
ma->mfiles = 0;
ma->dirs = 0;
- if (scan_areadef(ma, name) < 0)
+ if (scan_areadef(ma, name, spec) < 0)
{
logf (LOG_FATAL, "Failed to access description of '%s'", name);
return 0;
sprintf(tmpnam, "%s/%s", dirp->name, dent->d_name);
part_f->path = xstrdup(tmpnam);
/* get size */
- if ((fd = open(part_f->path, O_RDONLY)) < 0)
+ if ((fd = open(part_f->path, O_BINARY|O_RDONLY)) < 0)
{
logf (LOG_FATAL|LOG_ERRNO, "Failed to access %s",
dent->d_name);
return ma;
}
+void mf_destroy(MFile_area ma)
+{
+ mf_dir *dp;
+ meta_file *meta_f;
+
+ if (!ma)
+ return;
+ dp = ma->dirs;
+ while (dp)
+ {
+ mf_dir *d = dp;
+ dp = dp->next;
+ xfree (d);
+ }
+ meta_f = ma->mfiles;
+ while (meta_f)
+ {
+ int i;
+ meta_file *m = meta_f;
+
+ for (i = 0; i<m->no_files; i++)
+ {
+ xfree (m->files[i].path);
+ }
+ meta_f = meta_f->next;
+ xfree (m);
+ }
+ xfree (ma);
+}
+
/*
* Open a metafile.
* If !ma, Use MF_DEFAULT_AREA.
*/
MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag)
{
- struct meta_file *new;
+ struct meta_file *mnew;
int i;
char tmp[FILENAME_MAX+1];
mf_dir *dp;
logf(LOG_DEBUG, "mf_open(%s bs=%d, %s)", name, block_size,
wflag ? "RW" : "RDONLY");
- if (!ma)
- {
- if (!default_area && !(default_area = mf_init(MF_DEFAULT_AREA)))
- {
- logf (LOG_FATAL, "Failed to open default area.");
- return 0;
- }
- ma = default_area;
- }
- for (new = ma->mfiles; new; new = new->next)
- if (!strcmp(name, new->name))
- if (new->open)
+ assert (ma);
+ for (mnew = ma->mfiles; mnew; mnew = mnew->next)
+ if (!strcmp(name, mnew->name))
+ if (mnew->open)
abort();
else
break;
- if (!new)
+ if (!mnew)
{
- new = xmalloc(sizeof(*new));
- strcpy(new->name, name);
+ mnew = xmalloc(sizeof(*mnew));
+ strcpy(mnew->name, name);
/* allocate one, empty file */
- new->no_files = 1;
- new->files[0].bytes = new->files[0].blocks = 0;
- new->files[0].top = -1;
- new->files[0].number = 0;
- new->files[0].fd = -1;
- new->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
+ mnew->no_files = 1;
+ mnew->files[0].bytes = mnew->files[0].blocks = 0;
+ mnew->files[0].top = -1;
+ mnew->files[0].number = 0;
+ mnew->files[0].fd = -1;
+ mnew->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
for (dp = ma->dirs; dp && dp->max_bytes >= 0 && dp->avail_bytes <
- new->min_bytes_creat; dp = dp->next);
+ mnew->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.mf.%d", dp->name, new->name, 0);
- new->files[0].path = xstrdup(tmp);
- new->ma = ma;
+ mnew->files[0].dir = dp;
+ sprintf(tmp, "%s/%s.mf.%d", dp->name, mnew->name, 0);
+ mnew->files[0].path = xstrdup(tmp);
+ mnew->ma = ma;
+ mnew->next = ma->mfiles;
+ ma->mfiles = mnew;
}
else
{
- for (i = 0; i < new->no_files; i++)
+ for (i = 0; i < mnew->no_files; i++)
{
- if (new->files[i].bytes % block_size)
- new->files[i].bytes += block_size - new->files[i].bytes %
+ if (mnew->files[i].bytes % block_size)
+ mnew->files[i].bytes += block_size - mnew->files[i].bytes %
block_size;
- new->files[i].blocks = new->files[i].bytes / block_size;
+ mnew->files[i].blocks = mnew->files[i].bytes / block_size;
}
- assert(!new->open);
+ assert(!mnew->open);
}
- new->blocksize = block_size;
- new->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
- new->wr=wflag;
- new->cur_file = 0;
- new->open = 1;
+ mnew->blocksize = block_size;
+ mnew->min_bytes_creat = MF_MIN_BLOCKS_CREAT * block_size;
+ mnew->wr=wflag;
+ mnew->cur_file = 0;
+ mnew->open = 1;
- for (i = 0; i < new->no_files; i++)
+ for (i = 0; i < mnew->no_files; i++)
{
- new->files[i].blocks = new->files[i].bytes / new->blocksize;
- if (i == new->no_files - 1)
- new->files[i].top = -1;
+ mnew->files[i].blocks = mnew->files[i].bytes / mnew->blocksize;
+ if (i == mnew->no_files - 1)
+ mnew->files[i].top = -1;
else
- new->files[i].top = i ? (new->files[i-1].top + new->files[i].blocks)
- : (new->files[i].blocks - 1);
+ mnew->files[i].top =
+ i ? (mnew->files[i-1].top + mnew->files[i].blocks)
+ : (mnew->files[i].blocks - 1);
}
- return new;
+ return mnew;
}
/*