/*
- * 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.16 1995-12-12 15:57:57 adam
+ * 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
+ * Fixed ancient bug.
+ *
+ * Revision 1.18 1996/04/09 06:47:30 adam
+ * Function scan_areadef doesn't use sscanf (%n fails on this Linux).
+ *
+ * Revision 1.17 1996/03/20 13:29:11 quinn
+ * Bug-fix
+ *
+ * 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
#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");
- int offset = 0, rs, size, multi, rd;
- char dirname[FILENAME_MAX+1], unit;
+ 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 (;;)
{
- rs = sscanf(ad + offset, "%[^:]:%d%c %n", dirname, &size, &unit, &rd);
- if (rs <= 1)
- break;
- if (rs != 3)
+ const char *ad0 = ad;
+ int i = 0, fact = 1, multi, size = 0;
+
+ while (*ad == ' ' || *ad == '\t')
+ ad++;
+ if (!*ad)
+ break;
+ while (*ad && *ad != ':')
{
- logf (LOG_FATAL, "Illegal directory description: %s", ad + offset);
- return -1;
- }
- switch (unit)
+ if (i < FILENAME_MAX)
+ dirname[i++] = *ad;
+ ad++;
+ }
+ dirname[i] = '\0';
+ if (*ad++ != ':')
+ {
+ logf (LOG_FATAL, "Missing colon after path: %s", ad0);
+ return -1;
+ }
+ if (i == 0)
+ {
+ logf (LOG_FATAL, "Empty path: %s", ad0);
+ return -1;
+ }
+ while (*ad == ' ' || *ad == '\t')
+ ad++;
+ if (*ad == '-')
+ {
+ fact = -1;
+ ad++;
+ }
+ else if (*ad == '+')
+ ad++;
+ size = 0;
+ if (*ad < '0' || *ad > '9')
+ {
+ logf (LOG_FATAL, "Missing size after path: %s", ad0);
+ return -1;
+ }
+ size = 0;
+ while (*ad >= '0' && *ad <= '9')
+ size = size*10 + (*ad++ - '0');
+ switch (*ad)
{
case 'B': case 'b': multi = 1; break;
case 'K': case 'k': multi = 1024; break;
case 'M': case 'm': multi = 1048576; break;
+ case '\0':
+ logf (LOG_FATAL, "Missing unit: %s", ad0);
+ return -1;
default:
- logf (LOG_FATAL, "Illegal unit: %c in %s", unit, ad + offset);
+ logf (LOG_FATAL, "Illegal unit: %c in %s", *ad, ad0);
return -1;
}
+ ad++;
*dp = dir = xmalloc(sizeof(mf_dir));
dir->next = 0;
strcpy(dir->name, dirname);
- dir->max_bytes = dir->avail_bytes = size * multi;
+ dir->max_bytes = dir->avail_bytes = fact * size * multi;
dp = &dir->next;
- offset += rd;
}
return 0;
}
(c < mf->no_files -1 && pos > mf->files[c].top))
{
c = 0;
- while (mf->files[c].top >= 0 && mf->files[c].top < pos)
+ while (c + 1 < mf->no_files && mf->files[c].top < pos)
{
off += mf->files[c].blocks;
c++;
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(MFile_area_struct));
mf_dir *dirp;
meta_file *meta_f;
part_file *part_f = 0;
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);
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;
- }
+ assert (ma);
for (new = ma->mfiles; new; new = new->next)
if (!strcmp(name, new->name))
if (new->open)
for (i = 0; i < new->no_files; i++)
{
new->files[i].blocks = new->files[i].bytes / new->blocksize;
- if (i == new->no_files)
+ if (i == new->no_files - 1)
new->files[i].top = -1;
else
new->files[i].top = i ? (new->files[i-1].top + new->files[i].blocks)
/* file needs to grow */
while (ps >= mf->files[mf->cur_file].blocks)
{
- logf (LOG_DEBUG, "File grows");
/* file overflow - allocate new file */
if (mf->files[mf->cur_file].dir->max_bytes >= 0 &&
(ps - mf->files[mf->cur_file].blocks + 1) * mf->blocksize >