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

diff --git a/util/res.c b/util/res.c
index 10b600e..b78601c 100644
--- a/util/res.c
+++ b/util/res.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.16  1996-10-29 13:47:49  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
@@ -57,7 +67,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
 #include <unistd.h>
+#endif
 
 #include <zebrautl.h>
 #include <yaz-util.h>
@@ -189,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;
@@ -214,6 +232,7 @@ void res_close (Res r)
             xfree (re);
         }
     }
+    xfree (r->name);
     xfree (r);
 }
 
@@ -271,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;
@@ -285,7 +304,7 @@ 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);
 }