Minor changes.

[idzebra-moved-to-github.git] / dict / open.c

diff --git a/dict/open.c b/dict/open.c
index fda7f4f..e5319b3 100644 (file)
--- a/dict/open.c
+++ b/dict/open.c
@@ -4,12 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: open.c,v $
- * Revision 1.1  1994-08-16 16:26:49  adam
+ * Revision 1.5  1994-09-01 17:49:39  adam
+ * Removed stupid line. Work on insertion in dictionary. Not finished yet.
+ *
+ * Revision 1.4  1994/09/01  17:44:10  adam
+ * depend include change.
+ *
+ * Revision 1.3  1994/08/18  12:40:58  adam
+ * Some development of dictionary. Not finished at all!
+ *
+ * Revision 1.2  1994/08/17  13:32:20  adam
+ * Use cache in dict - not in bfile.
+ *
+ * Revision 1.1  1994/08/16  16:26:49  adam
  * Added dict.
  *
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -24,21 +35,20 @@ Dict dict_open (const char *name, int cache, int rw)
 
     dict = xmalloc (sizeof(*dict));
 
-    if (rw)
-        dict->bf = bf_open_w (name, DICT_PAGESIZE, cache);
-    else
-        dict->bf = bf_open (name, DICT_PAGESIZE, cache);
+    dict->dbf = dict_bf_open (name, DICT_PAGESIZE, cache, rw);
+    dict->rw = rw;
 
-    if(!dict->bf)
+    if(!dict->dbf)
     {
-        free (dict);
+        log (LOG_LOG, "cannot open `%s'", name);
+        xfree (dict);
         return NULL;
     }
-    if (bf_read (dict->bf, 0, &head_buf) <= 0)
+    if (dict_bf_readp (dict->dbf, 0, &head_buf) <= 0)
     {
         if (rw) 
         {   /* create header with information (page 0) */
-            bf_newp (dict->bf, 0, &head_buf);
+            dict_bf_newp (dict->dbf, 0, &head_buf);
             dh = (struct Dict_head *) head_buf;
             strcpy(dh->magic_str, DICT_MAGIC);
             dh->free_list = dh->last = 1;
@@ -54,16 +64,18 @@ Dict dict_open (const char *name, int cache, int rw)
     else /* header was there, check magic and page size */
     {
         dh = (struct Dict_head *) head_buf;
-        if (!strcmp (dh->magic_str, DICT_MAGIC))
+        if (strcmp (dh->magic_str, DICT_MAGIC))
         {
-            bf_close (dict->bf);
-            free (dict);
+            log (LOG_LOG, "bad magic of `%s'", name);
+            dict_bf_close (dict->dbf);
+            xfree (dict);
             return NULL;
         }
         if (dh->page_size != DICT_PAGESIZE)
         {
-            bf_close (dict->bf);
-            free (dict);
+            log (LOG_LOG, "page size mismatch of `%s'", name);
+            dict_bf_close (dict->dbf);
+            xfree (dict);
             return NULL;
         }
         memcpy (&dict->head, dh, sizeof(*dh));
@@ -78,5 +90,5 @@ int dict_strcmp (const Dict_char *s1, const Dict_char *s2)
 
 int dict_strlen (const Dict_char *s)
 {
-    return strlen(s)+1;
+    return strlen(s);
 }