X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=5ae3b3e12dae7ad136693ddc2f103b772efba408;hb=45dcbe04562559c1af90b5049fa1871311907072;hp=ccaf537223655cb29c4f5ea999431e4c6679e679;hpb=cba904dca083ec8742a47bbd03e810e553c6e72d;p=idzebra-moved-to-github.git diff --git a/bfile/bfile.c b/bfile/bfile.c index ccaf537..5ae3b3e 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,10 +1,41 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.c,v $ - * Revision 1.20 1996-03-26 15:59:04 adam + * Revision 1.30 1999-10-14 14:33:49 adam + * Added truncation 5=106. + * + * Revision 1.29 1999/05/26 07:49:12 adam + * C++ compilation. + * + * Revision 1.28 1999/05/12 13:08:05 adam + * First version of ISAMS. + * + * Revision 1.27 1999/02/02 14:50:01 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.26 1998/02/17 10:32:52 adam + * Fixed bug: binary files weren't opened with flag b on NT. + * + * Revision 1.25 1997/10/27 14:25:38 adam + * Fixed memory leaks. + * + * Revision 1.24 1997/09/18 08:59:16 adam + * Extra generic handle for the character mapping routines. + * + * Revision 1.23 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.22 1997/09/09 13:37:52 adam + * Partial port to WIN95/NT. + * + * Revision 1.21 1996/10/29 13:56:13 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.20 1996/03/26 15:59:04 adam * The directory of the shadow table file can be specified by the new * bf_lockDir call. * @@ -69,67 +100,88 @@ #include #include #include +#ifdef WIN32 +#include +#else #include +#endif -#include +#include #include #include "cfile.h" -static MFile_area commit_area = NULL; -static char *commit_lockDir = NULL; +struct BFiles_struct { + MFile_area commit_area; + MFile_area_struct *register_area; + char *lockDir; +}; -static FILE *open_cache (const char *flags) +BFiles bfs_create (const char *spec) +{ + BFiles bfs = (BFiles) xmalloc (sizeof(*bfs)); + bfs->commit_area = NULL; + bfs->register_area = mf_init("register", spec); + bfs->lockDir = NULL; + if (!bfs->register_area) + { + bfs_destroy(bfs); + return 0; + } + return bfs; +} + +void bfs_destroy (BFiles bfs) +{ + xfree (bfs->lockDir); + mf_destroy (bfs->commit_area); + mf_destroy (bfs->register_area); + xfree (bfs); +} + +static FILE *open_cache (BFiles bfs, const char *flags) { char cacheFilename[1024]; FILE *file; - sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : ""); + sprintf (cacheFilename, "%scache", + bfs->lockDir ? bfs->lockDir : ""); file = fopen (cacheFilename, flags); return file; } -static void unlink_cache (void) +static void unlink_cache (BFiles bfs) { char cacheFilename[1024]; - sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : ""); + sprintf (cacheFilename, "%scache", + bfs->lockDir ? bfs->lockDir : ""); unlink (cacheFilename); } -void bf_lockDir (const char *lockDir) +void bf_lockDir (BFiles bfs, const char *lockDir) { size_t len; - xfree (commit_lockDir); - + xfree (bfs->lockDir); if (lockDir == NULL) lockDir = ""; len = strlen(lockDir); - commit_lockDir = xmalloc (len+2); - strcpy (commit_lockDir, lockDir); + bfs->lockDir = (char *) xmalloc (len+2); + strcpy (bfs->lockDir, lockDir); - if (len > 0 && commit_lockDir[len-1] != '/') - strcpy (commit_lockDir + len, "/"); + if (len > 0 && bfs->lockDir[len-1] != '/') + strcpy (bfs->lockDir + len, "/"); } -void bf_cache (int enableFlag) +void bf_cache (BFiles bfs, const char *spec) { - if (enableFlag) + if (spec) { - if (!commit_area) - if (res_get (common_resource, "shadow")) - { - commit_area = mf_init ("shadow"); - } - else - { - logf (LOG_FATAL, "Shadow area must be defined if commit" - "is to be enabled"); - exit (1); - } + if (!bfs->commit_area) + bfs->commit_area = mf_init ("shadow", spec); } else - commit_area = NULL; + bfs->commit_area = NULL; } int bf_close (BFile bf) @@ -141,26 +193,26 @@ int bf_close (BFile bf) return 0; } -BFile bf_open (const char *name, int block_size, int wflag) +BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag) { - BFile tmp = xmalloc(sizeof(BFile_struct)); + BFile tmp = (BFile) xmalloc(sizeof(BFile_struct)); - if (commit_area) + if (bfs->commit_area) { int first_time; - tmp->mf = mf_open (0, name, block_size, 0); - tmp->cf = cf_open (tmp->mf, commit_area, name, block_size, + tmp->mf = mf_open (bfs->register_area, name, block_size, 0); + tmp->cf = cf_open (tmp->mf, bfs->commit_area, name, block_size, wflag, &first_time); if (first_time) { FILE *outf; - outf = open_cache ("a"); + outf = open_cache (bfs, "ab"); if (!outf) { logf (LOG_FATAL|LOG_ERRNO, "open %scache", - commit_lockDir ? commit_lockDir : ""); + bfs->lockDir ? bfs->lockDir : ""); exit (1); } fprintf (outf, "%s %d\n", name, block_size); @@ -169,7 +221,7 @@ BFile bf_open (const char *name, int block_size, int wflag) } else { - tmp->mf = mf_open(0, name, block_size, wflag); + tmp->mf = mf_open(bfs->register_area, name, block_size, wflag); tmp->cf = NULL; } if (!tmp->mf) @@ -181,27 +233,27 @@ BFile bf_open (const char *name, int block_size, int wflag) return(tmp); } -int bf_read (BFile bf, int no, int offset, int num, void *buf) +int bf_read (BFile bf, int no, int offset, int nbytes, void *buf) { int r; - if (bf->cf && (r=cf_read (bf->cf, no, offset, num, buf)) != -1) + if (bf->cf && (r=cf_read (bf->cf, no, offset, nbytes, buf)) != -1) return r; - return mf_read (bf->mf, no, offset, num, buf); + return mf_read (bf->mf, no, offset, nbytes, buf); } -int bf_write (BFile bf, int no, int offset, int num, const void *buf) +int bf_write (BFile bf, int no, int offset, int nbytes, const void *buf) { if (bf->cf) - return cf_write (bf->cf, no, offset, num, buf); - return mf_write (bf->mf, no, offset, num, buf); + return cf_write (bf->cf, no, offset, nbytes, buf); + return mf_write (bf->mf, no, offset, nbytes, buf); } -int bf_commitExists (void) +int bf_commitExists (BFiles bfs) { FILE *inf; - inf = open_cache ("r"); + inf = open_cache (bfs, "rb"); if (inf) { fclose (inf); @@ -210,7 +262,7 @@ int bf_commitExists (void) return 0; } -void bf_commitExec (void) +void bf_commitExec (BFiles bfs) { FILE *inf; int block_size; @@ -219,16 +271,16 @@ void bf_commitExec (void) CFile cf; int first_time; - assert (commit_area); - if (!(inf = open_cache ("r"))) + assert (bfs->commit_area); + if (!(inf = open_cache (bfs, "rb"))) { logf (LOG_LOG, "No commit file"); return ; } while (fscanf (inf, "%s %d", path, &block_size) == 2) { - mf = mf_open (0, path, block_size, 1); - cf = cf_open (mf, commit_area, path, block_size, 0, &first_time); + mf = mf_open (bfs->register_area, path, block_size, 1); + cf = cf_open (mf, bfs->commit_area, path, block_size, 0, &first_time); cf_commit (cf); @@ -238,7 +290,7 @@ void bf_commitExec (void) fclose (inf); } -void bf_commitClean (void) +void bf_commitClean (BFiles bfs, const char *spec) { FILE *inf; int block_size; @@ -248,24 +300,24 @@ void bf_commitClean (void) int mustDisable = 0; int firstTime; - if (!commit_area) + if (!bfs->commit_area) { - bf_cache (1); + bf_cache (bfs, spec); mustDisable = 1; } - if (!(inf = open_cache ("r"))) + if (!(inf = open_cache (bfs, "rb"))) return ; while (fscanf (inf, "%s %d", path, &block_size) == 2) { - mf = mf_open (0, path, block_size, 0); - cf = cf_open (mf, commit_area, path, block_size, 1, &firstTime); + mf = mf_open (bfs->register_area, path, block_size, 0); + cf = cf_open (mf, bfs->commit_area, path, block_size, 1, &firstTime); cf_unlink (cf); cf_close (cf); mf_close (mf); } fclose (inf); - unlink_cache (); + unlink_cache (bfs); if (mustDisable) - bf_cache (0); + bf_cache (bfs, 0); }