Support for YAZ in standard located directories, such as /usr/local/..

[idzebra-moved-to-github.git] / util / res.c

diff --git a/util/res.c b/util/res.c
index 1fa860f..0b2cc75 100644 (file)
--- a/util/res.c
+++ b/util/res.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.8  1994-09-16 14:37:12  quinn
+ * 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
@@ -12,7 +27,6 @@
  *
  * Revision 1.6  1994/09/01  17:45:14  adam
  * Work on resource manager.
- * CVS ----------------------------------------------------------------------
  *
  * Revision 1.5  1994/08/18  11:02:28  adam
  * Implementation of res_write.
@@ -35,7 +49,7 @@
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
-#include <util.h>
+#include <alexutil.h>
 
 static struct res_entry *add_entry (Res r)
 {
@@ -73,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)
@@ -125,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;
                 }
@@ -164,12 +178,10 @@ Res res_open (const char *name)
 {
     Res r;
     if (access (name, R_OK))
-    {
-        log (LOG_LOG|LOG_ERRNO, "cannot access `%s'", name);
-        xfree (r);
-    }
+        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;
 }
@@ -211,7 +223,10 @@ 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;
 }
@@ -267,7 +282,7 @@ int res_write (Res r)
     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);
     }