X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=deb1785b528a031447dcaa86af06251cbf6dfdf8;hb=067b55382bc9916b3f7dcd473512c703d4de4a5d;hp=10b600e0b54360169c4e76d5bca5ec37e7e1757a;hpb=3e8be1519166498594f00dc76671cb28d0b0ec4a;p=idzebra-moved-to-github.git diff --git a/util/res.c b/util/res.c index 10b600e..deb1785 100644 --- a/util/res.c +++ b/util/res.c @@ -4,7 +4,14 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: res.c,v $ - * Revision 1.16 1996-10-29 13:47:49 adam + * 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 +64,11 @@ #include #include #include +#ifdef WINDOWS +#include +#else #include +#endif #include #include @@ -189,7 +200,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; @@ -271,8 +286,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 +300,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); }