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

diff --git a/util/res.c b/util/res.c
index 0b2cc75..b78601c 100644
--- a/util/res.c
+++ b/util/res.c
@@ -4,7 +4,26 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.13  1995-09-04 12:34:05  adam
+ * Revision 1.19  1997-10-27 14:27:59  adam
+ * Fixed memory leak.
+ *
+ * Revision 1.18  1997/09/17 12:19:24  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.17  1997/09/09 13:38:19  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.16  1996/10/29 13:47:49  adam
+ * Implemented res_get_match. Updated to use zebrautl instead of alexpath.
+ *
+ * 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
@@ -48,8 +67,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
 #include <unistd.h>
-#include <alexutil.h>
+#endif
+
+#include <zebrautl.h>
+#include <yaz-util.h>
 
 static struct res_entry *add_entry (Res r)
 {
@@ -73,7 +98,6 @@ static void reread (Res r)
     char *line;
     char *val_buf;
     int val_size, val_max = 256;
-    char path[256];
     char fr_buf[1024];
     FILE *fr;
 
@@ -82,12 +106,10 @@ static void reread (Res r)
 
     val_buf = xmalloc (val_max);
 
-    strcpy (path, alex_path(r->name));
-
-    fr = fopen (path, "r");
+    fr = fopen (r->name, "r");
     if (!fr)
     {
-        logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", path);
+        logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", r->name);
         exit (1);
     }
     while (1)
@@ -136,6 +158,10 @@ 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);
@@ -177,7 +203,11 @@ static void reread (Res r)
 Res res_open (const char *name)
 {
     Res r;
+#ifdef WINDOWS
+    if (access (name, 4))
+#else
     if (access (name, R_OK))
+#endif
         logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
     r = xmalloc (sizeof(*r));
     r->init = 0;
@@ -202,6 +232,7 @@ void res_close (Res r)
             xfree (re);
         }
     }
+    xfree (r->name);
     xfree (r);
 }
 
@@ -213,7 +244,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;
 }
@@ -231,6 +262,15 @@ char *res_get_def (Res r, const char *name, char *def)
     	return t;
 }
 
+int res_get_match (Res r, const char *name, const char *value, const char *s)
+{
+    const char *cn = res_get (r, name);
+
+    if (cn && !yaz_matchstr (cn, value))
+        return 1;
+    return 0;
+}
+
 void res_put (Res r, const char *name, const char *value)
 {
     struct res_entry *re;
@@ -239,7 +279,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);
@@ -250,8 +290,8 @@ void res_put (Res r, const char *name, const char *value)
     re->value = xstrdup (value);
 }
 
-void res_trav (Res r, const char *prefix, 
-               void (*f)(const char *name, const char *value))
+void res_trav (Res r, const char *prefix, void *p,
+               void (*f)(void *p, const char *name, const char *value))
 {
     struct res_entry *re;
     int l = 0;
@@ -264,25 +304,22 @@ void res_trav (Res r, const char *prefix,
     for (re = r->first; re; re=re->next)
         if (re->value)
             if (l==0 || !memcmp (re->name, prefix, l))
-                (*f)(re->name, re->value);
+                (*f)(p, re->name, re->value);
 }
 
 
 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");
+    fr = fopen (r->name, "w");
     if (!fr)
     {
-        logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", path);
+        logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", r->name);
         exit (1);
     }