X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=0b2cc7591bde6cfda25bdcfad153d609c9acbd8f;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=f98b2d5e4e539c22d1089eb8354824a44d5a9dc0;hpb=5ea84896a9b5edc8675f3646762e8ef906d6a307;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index f98b2d5..0b2cc75 100644
--- a/util/res.c
+++ b/util/res.c
@@ -4,7 +4,31 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.5  1994-08-18 11:02:28  adam
+ * Revision 1.13  1995-09-04 12:34:05  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.12  1995/01/24  16:40:32  adam
+ * Bug fix.
+ *
+ * Revision 1.11  1994/10/05  16:54:52  adam
+ * Minor changes.
+ *
+ * Revision 1.10  1994/10/05  10:47:31  adam
+ * Small bug fix.
+ *
+ * Revision 1.9  1994/09/16  14:41:12  quinn
+ * Added log warning to res_get_def
+ *
+ * Revision 1.8  1994/09/16  14:37:12  quinn
+ * added res_get_def
+ *
+ * Revision 1.7  1994/09/06  13:01:03  quinn
+ * Removed const from declaration of res_get
+ *
+ * Revision 1.6  1994/09/01  17:45:14  adam
+ * Work on resource manager.
+ *
+ * Revision 1.5  1994/08/18  11:02:28  adam
  * Implementation of res_write.
  *
  * Revision 1.4  1994/08/18  10:02:01  adam
@@ -24,7 +48,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <util.h>
+#include <unistd.h>
+#include <alexutil.h>
 
 static struct res_entry *add_entry (Res r)
 {
@@ -52,6 +77,7 @@ static void reread (Res r)
     char fr_buf[1024];
     FILE *fr;
 
+    assert (r);
     r->init = 1;
 
     val_buf = xmalloc (val_max);
@@ -61,7 +87,7 @@ static void reread (Res r)
     fr = fopen (path, "r");
     if (!fr)
     {
-        log (LOG_FATAL|LOG_ERRNO, "cannot open %s", path);
+        logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", path);
         exit (1);
     }
     while (1)
@@ -113,7 +139,7 @@ static void reread (Res r)
                     val_buf[val_size++] = '\0';
                     resp->value = xmalloc (val_size);
                     strcpy (resp->value, val_buf);
-                    log (LOG_DEBUG, "(name=%s,value=%s)",
+                    logf (LOG_DEBUG, "(name=%s,value=%s)",
                          resp->name, resp->value);
                     break;
                 }
@@ -150,14 +176,19 @@ static void reread (Res r)
 
 Res res_open (const char *name)
 {
-    Res r = xmalloc (sizeof(*r));
+    Res r;
+    if (access (name, R_OK))
+        logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
+    r = xmalloc (sizeof(*r));
     r->init = 0;
+    r->first = r->last = NULL;
     r->name = xstrdup (name);
     return r;
 }
 
 void res_close (Res r)
 {
+    assert (r);
     if (r->init)
     {
         struct res_entry *re, *re1;
@@ -174,21 +205,36 @@ void res_close (Res r)
     xfree (r);
 }
 
-const char *res_get (Res r, const char *name)
+char *res_get (Res r, const char *name)
 {
     struct res_entry *re;
+
+    assert (r);
     if (!r->init)
         reread (r);
-    
     for (re = r->first; re; re=re->next)
         if (re->value && !strcmp (re->name, name))
             return re->value;
     return NULL;
 }
 
+char *res_get_def (Res r, const char *name, char *def)
+{
+    char *t;
+
+    if (!(t = res_get (r, name)))
+    {
+    	logf (LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
+    	return def;
+    }
+    else
+    	return t;
+}
+
 void res_put (Res r, const char *name, const char *value)
 {
     struct res_entry *re;
+    assert (r);
     if (!r->init)
         reread (r);
 
@@ -210,6 +256,7 @@ void res_trav (Res r, const char *prefix,
     struct res_entry *re;
     int l = 0;
 
+    assert (r);
     if (prefix)
         l = strlen(prefix);
     if (!r->init)
@@ -226,15 +273,16 @@ int res_write (Res r)
     struct res_entry *re;
     char path[256];
     FILE *fr;
+
+    assert (r);
     if (!r->init)
         reread (r);
-
     strcpy (path, alex_path(r->name));
 
     fr = fopen (path, "w");
     if (!fr)
     {
-        log (LOG_FATAL|LOG_ERRNO, "cannot create %s", path);
+        logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", path);
         exit (1);
     }