X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=4e25261acd819a01839b7aa94b6afe8898fccf47;hb=9316ebeab370ca5ee115c7eaecbd195d5b92abe1;hp=0b2cc7591bde6cfda25bdcfad153d609c9acbd8f;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89;p=idzebra-moved-to-github.git diff --git a/util/res.c b/util/res.c index 0b2cc75..4e25261 100644 --- a/util/res.c +++ b/util/res.c @@ -4,7 +4,29 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: res.c,v $ - * Revision 1.13 1995-09-04 12:34:05 adam + * Revision 1.20 1997-10-31 12:39:15 adam + * Resouce name can be terminated with either white-space or colon. + * + * 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 +70,14 @@ #include #include #include +#ifdef WINDOWS +#include +#else #include -#include +#endif + +#include +#include static struct res_entry *add_entry (Res r) { @@ -73,7 +101,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,17 +109,15 @@ 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) { - line = fgets (fr_buf, 1023, fr); + line = fgets (fr_buf, sizeof(fr_buf)-1, fr); if (!line) break; if (*line == '#') @@ -115,27 +140,31 @@ static void reread (Res r) { if (fr_buf[no] == 0 || fr_buf[no] == '\n' ) { - no = -1; + no = 0; break; } - if (fr_buf[no] == ':') + if (strchr (": \t", fr_buf[no])) break; no++; } - if (no < 0) + if (!no) continue; fr_buf[no++] = '\0'; resp = add_entry (r); resp->name = xmalloc (no); strcpy (resp->name, fr_buf); - while (fr_buf[no] == ' ') + while (strchr (" \t", fr_buf[no])) no++; val_size = 0; while (1) { 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); @@ -145,7 +174,7 @@ static void reread (Res r) } else if (fr_buf[no] == '\\' && fr_buf[no+1] == '\n') { - line = fgets (fr_buf, 1023, fr); + line = fgets (fr_buf, sizeof(fr_buf)-1, fr); if (!line) { resp->value = xmalloc (val_size); @@ -177,7 +206,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 +235,7 @@ void res_close (Res r) xfree (re); } } + xfree (r->name); xfree (r); } @@ -213,7 +247,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 +265,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 +282,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 +293,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 +307,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); }