* Sebastian Hammer, Adam Dickmeiss
*
* $Log: bfile.c,v $
- * Revision 1.15 1995-12-01 16:24:28 adam
+ * Revision 1.16 1995-12-08 16:21:13 adam
+ * Work on commit/update.
+ *
+ * Revision 1.15 1995/12/01 16:24:28 adam
* Commit files use separate meta file area.
*
* Revision 1.14 1995/12/01 11:37:21 adam
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
+#include <unistd.h>
#include <alexutil.h>
#include <bfile.h>
static MFile_area commit_area = NULL;
-void bf_cache (void)
+void bf_cache (int enableFlag)
{
- if (!commit_area)
- if (res_get (common_resource, "commit"))
- commit_area = mf_init ("commit");
- else
- {
- logf (LOG_FATAL, "Commit area must be defined if commit"
- "is to be enabled");
- exit (1);
- }
+ if (enableFlag)
+ {
+ if (!commit_area)
+ if (res_get (common_resource, "commit"))
+ commit_area = mf_init ("commit");
+ else
+ {
+ logf (LOG_FATAL, "Commit area must be defined if commit"
+ "is to be enabled");
+ exit (1);
+ }
+ }
+ else
+ commit_area = NULL;
}
int bf_close (BFile bf)
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");
return mf_write (bf->mf, no, offset, num, buf);
}
-void bf_commit (void)
+int bf_commitExists (void)
+{
+ FILE *inf;
+
+ inf = fopen ("cache", "r");
+ if (inf)
+ {
+ fclose (inf);
+ return 1;
+ }
+ return 0;
+}
+
+void bf_commitExec (void)
{
FILE *inf;
int block_size;
assert (commit_area);
if (!(inf = fopen ("cache", "r")))
{
- logf (LOG_FATAL|LOG_ERRNO, "cannot open commit %s", "cache");
- exit (1);
+ logf (LOG_LOG, "No commit file");
+ return ;
}
while (fscanf (inf, "%s %d", path, &block_size) == 2)
{
}
fclose (inf);
}
+
+void bf_commitClean (void)
+{
+ FILE *inf;
+ int block_size;
+ char path[256];
+ MFile mf;
+ CFile cf;
+
+ assert (commit_area);
+ if (!(inf = fopen ("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_close (cf);
+ mf_close (mf);
+ }
+ fclose (inf);
+ unlink ("cache");
+}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: cfile.c,v $
- * Revision 1.4 1995-12-01 16:24:28 adam
+ * Revision 1.5 1995-12-08 16:21:14 adam
+ * Work on commit/update.
+ *
+ * Revision 1.4 1995/12/01 16:24:28 adam
* Commit files use separate meta file area.
*
* Revision 1.3 1995/12/01 11:37:22 adam
logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", path);
exit (1);
}
- if (!mf_read (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head))
+ if (!firstp || !mf_read (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head))
{
- *firstp = 1;
+ if (firstp)
+ *firstp = 1;
cf->head.block_size = block_size;
cf->head.hash_size = 401;
hash_bytes = cf->head.hash_size * sizeof(int);
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: mfile.c,v $
- * Revision 1.14 1995-12-05 13:12:37 quinn
+ * 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
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;