X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=a160f132f527d4b67c9125ba42f84a05f7aa6004;hb=805db1945539e97bd09b17d91eefc8eeb1652213;hp=210946eb780aae6b2d4387e5a02678b65a505883;hpb=90a8309f2165abe2cd76e096837d886cc9fe89fb;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index 210946e..a160f13 100644
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: bfile.c,v $
- * Revision 1.13  1995-11-30 17:00:49  adam
+ * 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
+ * Commit files use separate meta file area.
+ *
+ * Revision 1.14  1995/12/01  11:37:21  adam
+ * Cached/commit files implemented as meta-files.
+ *
+ * Revision 1.13  1995/11/30  17:00:49  adam
  * Several bug fixes. Commit system runs now.
  *
  * Revision 1.12  1995/11/30  08:33:10  adam
@@ -43,20 +59,32 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <stdlib.h>
+#include <assert.h>
+#include <unistd.h>
 
 #include <alexutil.h>
 #include <bfile.h>
 #include "cfile.h"
 
-static const char *cache_name = NULL;
+static MFile_area commit_area = NULL;
 
-void bf_cache (const char *name)
+void bf_cache (int enableFlag)
 {
-    cache_name = name;
+    if (enableFlag)
+    {
+        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);
+            }
+    }
+    else
+        commit_area = NULL;
 }
 
 int bf_close (BFile bf)
@@ -72,19 +100,19 @@ BFile bf_open (const char *name, int block_size, int wflag)
 {
     BFile tmp = xmalloc(sizeof(BFile_struct));
 
-    if (cache_name)
+    if (commit_area)
     {
         FILE *outf;
         int first_time;
 
-        logf (LOG_LOG, "cf,mf_open %s, cache_name=%s", name, cache_name);
-        tmp->mf = mf_open(0, name, block_size, 0);
-        tmp->cf = cf_open(tmp->mf, cache_name, name, block_size, wflag,
-                          &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_name, "a");
+            outf = fopen ("cache", "a");
             fprintf (outf, "%s %d\n", name, block_size);
             fclose (outf);
         }
@@ -119,7 +147,20 @@ int bf_write (BFile bf, int no, int offset, int num, const void *buf)
     return mf_write (bf->mf, no, offset, num, buf);
 }
 
-void bf_commit (const char *name)
+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;
@@ -128,15 +169,16 @@ void bf_commit (const char *name)
     CFile cf;
     int first_time;
 
-    if (!(inf = fopen (name, "r")))
+    assert (commit_area);
+    if (!(inf = fopen ("cache", "r")))
     {
-        logf (LOG_FATAL|LOG_ERRNO, "cannot open commit %s", name);
-        exit (1);
+        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, name, path, block_size, 0, &first_time);
+        mf = mf_open (0, path, block_size, 1);
+        cf = cf_open (mf, commit_area, path, block_size, 0, &first_time);
 
         cf_commit (cf);
 
@@ -145,3 +187,35 @@ void bf_commit (const char *name)
     }
     fclose (inf);
 }
+
+void bf_commitClean (void)
+{
+    FILE *inf;
+    int block_size;
+    char path[256];
+    MFile mf;
+    CFile cf;
+    int mustDisable = 0;
+    int firstTime;
+
+    if (!commit_area)
+    {
+        bf_cache (1);
+        mustDisable = 1;
+    }
+
+    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, &firstTime);
+        cf_unlink (cf);
+        cf_close (cf);
+        mf_close (mf);
+    }
+    fclose (inf);
+    unlink ("cache");
+    if (mustDisable)
+        bf_cache (0);
+}