Work on character-set handling

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

diff --git a/util/res.c b/util/res.c
index 10891dc..0864a91 100644 (file)
--- a/util/res.c
+++ b/util/res.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.12  1995-01-24 16:40:32  adam
+ * Revision 1.15  1996-05-22 08:23:43  adam
+ * Bug fix: trailing blanks in resource values where not removed.
+ *
+ * Revision 1.14  1996/04/26 11:51:20  adam
+ * Resource names are matched by the yaz_matchstr routine instead of strcmp.
+ *
+ * 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
@@ -46,7 +55,8 @@
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
-#include <util.h>
+#include <alexutil.h>
+#include <yaz-util.h>
 
 static struct res_entry *add_entry (Res r)
 {
@@ -84,7 +94,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)
@@ -133,10 +143,14 @@ static void reread (Res r)
             {
                 if (fr_buf[no] == '\0' || fr_buf[no] == '\n')
                 {
+                    while (val_size > 0 &&
+                              (val_buf[val_size-1] == ' ' ||
+                               val_buf[val_size-1] == '\t'))
+                        val_size--;
                     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;
                 }
@@ -175,7 +189,7 @@ Res res_open (const char *name)
 {
     Res r;
     if (access (name, R_OK))
-        log (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
+        logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
     r = xmalloc (sizeof(*r));
     r->init = 0;
     r->first = r->last = NULL;
@@ -210,7 +224,7 @@ char *res_get (Res r, const char *name)
     if (!r->init)
         reread (r);
     for (re = r->first; re; re=re->next)
-        if (re->value && !strcmp (re->name, name))
+        if (re->value && !yaz_matchstr (re->name, name))
             return re->value;
     return NULL;
 }
@@ -221,7 +235,7 @@ char *res_get_def (Res r, const char *name, char *def)
 
     if (!(t = res_get (r, name)))
     {
-       log(LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
+       logf (LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
        return def;
     }
     else
@@ -236,7 +250,7 @@ void res_put (Res r, const char *name, const char *value)
         reread (r);
 
     for (re = r->first; re; re=re->next)
-        if (re->value && !strcmp (re->name, name))
+        if (re->value && !yaz_matchstr (re->name, name))
         {
             xfree (re->value);
             re->value = xstrdup (value);
@@ -279,7 +293,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);
     }