X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=bfile%2Fbfile.c;h=90a058bc3e50905ac7322ce8bcdcedbc8f4303ae;hb=b8d492961ba89859e02543581d097b75a59b546c;hp=256fe62ef40635a9dfe8321074ec7c36c803f126;hpb=ed679affe3ae7402b38418f6b98fb8744915e19b;p=idzebra-moved-to-github.git

diff --git a/bfile/bfile.c b/bfile/bfile.c
index 256fe62..90a058b 100644
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: bfile.c,v $
- * Revision 1.14  1995-12-01 11:37:21  adam
+ * 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
+ * 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
@@ -46,10 +62,9 @@
  */
 
 #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>
@@ -57,10 +72,22 @@
 
 static MFile_area commit_area = NULL;
 
-void bf_cache (void)
+void bf_cache (int enableFlag)
 {
-    if (!commit_area)
-        commit_area = mf_init ("commit");
+    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)
@@ -81,10 +108,9 @@ BFile bf_open (const char *name, int block_size, int wflag)
         FILE *outf;
         int first_time;
 
-        logf (LOG_LOG, "cf,mf_open %s", name);
-        tmp->mf = mf_open (commit_area, name, block_size, 0);
-        tmp->cf = cf_open (tmp->mf, name, block_size, wflag, &first_time);
-
+        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");
@@ -122,7 +148,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 (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;
@@ -131,17 +170,16 @@ void bf_commit (void)
     CFile cf;
     int first_time;
 
-    if (!commit_area)
-        commit_area = mf_init ("commit");
+    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)
     {
-        mf = mf_open (commit_area, path, block_size, 1);
-        cf = cf_open (mf, 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);
 
@@ -150,3 +188,35 @@ void bf_commit (void)
     }
     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);
+}