* Sebastian Hammer, Adam Dickmeiss
*
* $Log: bfile.c,v $
- * Revision 1.16 1995-12-08 16:21:13 adam
+ * 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.
+ *
+ * Revision 1.19 1996/02/05 12:28:58 adam
+ * Removed a LOG_LOG message.
+ *
+ * Revision 1.18 1996/01/02 08:59:06 quinn
+ * Changed "commit" setting to "shadow".
+ *
+ * Revision 1.17 1995/12/11 09:03:51 adam
+ * New function: cf_unlink.
+ * New member of commit file head: state (0) deleted, (1) hash file.
+ *
+ * Revision 1.16 1995/12/08 16:21:13 adam
* Work on commit/update.
*
* Revision 1.15 1995/12/01 16:24:28 adam
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <assert.h>
#include <unistd.h>
-#include <alexutil.h>
+#include <zebrautl.h>
#include <bfile.h>
#include "cfile.h"
static MFile_area commit_area = NULL;
+static char *commit_lockDir = NULL;
+
+static FILE *open_cache (const char *flags)
+{
+ char cacheFilename[1024];
+ FILE *file;
+
+ sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : "");
+ file = fopen (cacheFilename, flags);
+ return file;
+}
+
+static void unlink_cache (void)
+{
+ char cacheFilename[1024];
+
+ sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : "");
+ unlink (cacheFilename);
+}
+
+void bf_lockDir (const char *lockDir)
+{
+ size_t len;
+
+ xfree (commit_lockDir);
+
+ if (lockDir == NULL)
+ lockDir = "";
+ len = strlen(lockDir);
+ commit_lockDir = xmalloc (len+2);
+ strcpy (commit_lockDir, lockDir);
+
+ if (len > 0 && commit_lockDir[len-1] != '/')
+ strcpy (commit_lockDir + len, "/");
+}
void bf_cache (int enableFlag)
{
if (enableFlag)
{
if (!commit_area)
- if (res_get (common_resource, "commit"))
- commit_area = mf_init ("commit");
+ if (res_get (common_resource, "shadow"))
+ {
+ commit_area = mf_init ("shadow");
+ }
else
{
- logf (LOG_FATAL, "Commit area must be defined if commit"
+ logf (LOG_FATAL, "Shadow area must be defined if commit"
"is to be enabled");
exit (1);
}
if (commit_area)
{
- FILE *outf;
int first_time;
- logf (LOG_LOG, "cf,mf_open %s", name);
-
tmp->mf = mf_open (0, name, block_size, 0);
tmp->cf = cf_open (tmp->mf, commit_area, name, block_size,
wflag, &first_time);
if (first_time)
{
- outf = fopen ("cache", "a");
+ FILE *outf;
+
+ outf = open_cache ("a");
+ if (!outf)
+ {
+ logf (LOG_FATAL|LOG_ERRNO, "open %scache",
+ commit_lockDir ? commit_lockDir : "");
+ exit (1);
+ }
fprintf (outf, "%s %d\n", name, block_size);
fclose (outf);
}
{
FILE *inf;
- inf = fopen ("cache", "r");
+ inf = open_cache ("r");
if (inf)
{
fclose (inf);
int first_time;
assert (commit_area);
- if (!(inf = fopen ("cache", "r")))
+ if (!(inf = open_cache ("r")))
{
logf (LOG_LOG, "No commit file");
return ;
char path[256];
MFile mf;
CFile cf;
+ int mustDisable = 0;
+ int firstTime;
- assert (commit_area);
- if (!(inf = fopen ("cache", "r")))
+ if (!commit_area)
+ {
+ bf_cache (1);
+ mustDisable = 1;
+ }
+
+ if (!(inf = open_cache ("r")))
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, NULL);
-
+ cf = cf_open (mf, commit_area, path, block_size, 1, &firstTime);
+ cf_unlink (cf);
cf_close (cf);
mf_close (mf);
}
fclose (inf);
- unlink ("cache");
+ unlink_cache ();
+ if (mustDisable)
+ bf_cache (0);
}