X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=f9e6689176a6279ea6042ec2edaa67446b2ed903;hb=cc9f94a61cbd9dcc0df0cf7d0c7c41d2cec88189;hp=5655a61a6f5bf3f6ce5b6f79bd8f8e12cdde2014;hpb=04b60639ac0ea45d8e9712014b01703cc3ac69cd;p=idzebra-moved-to-github.git diff --git a/util/res.c b/util/res.c index 5655a61..f9e6689 100644 --- a/util/res.c +++ b/util/res.c @@ -1,52 +1,76 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-2002, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * - * $Log: res.c,v $ - * Revision 1.4 1994-08-18 10:02:01 adam - * Module alexpath moved from res.c to alexpath.c. Minor changes in res-test.c - * - * Revision 1.3 1994/08/18 09:43:51 adam - * Development of resource manager. Only missing is res_write. - * - * Revision 1.2 1994/08/18 08:23:26 adam - * Res.c now use handles. xmalloc defines xstrdup. - * - * Revision 1.1 1994/08/17 15:34:23 adam - * Initial version of resource manager. - * + * $Id: res.c,v 1.30 2002-04-04 20:50:37 adam Exp $ */ #include #include #include -#include +#include +#ifdef WIN32 +#include +#else +#include +#endif + +#include +#include + +struct res_entry { + char *name; + char *value; + struct res_entry *next; +}; + +struct res_struct { + struct res_entry *first, *last; + char *name; + int init; + Res def_res; +}; + +static struct res_entry *add_entry (Res r) +{ + struct res_entry *resp; + + if (!r->first) + resp = r->last = r->first = + (struct res_entry *) xmalloc (sizeof(*resp)); + else + { + resp = (struct res_entry *) xmalloc (sizeof(*resp)); + r->last->next = resp; + r->last = resp; + } + resp->next = NULL; + return resp; +} static void reread (Res r) { struct res_entry *resp; char *line; char *val_buf; - int val_size, val_max = 1024; - char path[256]; + int val_size, val_max = 256; char fr_buf[1024]; FILE *fr; + assert (r); r->init = 1; - val_buf = xmalloc (val_max); + val_buf = (char*) xmalloc (val_max); - strcpy (path, alex_path(r->name)); - - fr = fopen (path, "r"); + fr = fopen (r->name, "r"); if (!fr) { - log (LOG_FATAL|LOG_ERRNO, "cannot open %s", path); - exit (1); + logf (LOG_WARN|LOG_ERRNO, "Cannot open %s", r->name); + return ; } while (1) { - line = fgets (fr_buf, 1023, fr); + line = fgets (fr_buf, sizeof(fr_buf)-1, fr); if (!line) break; if (*line == '#') @@ -57,16 +81,8 @@ static void reread (Res r) no++; fr_buf[no] = '\0'; - if (!r->first) - resp = r->last = r->first = xmalloc (sizeof(*resp)); - else - { - resp = xmalloc (sizeof(*resp)); - r->last->next = resp; - r->last = resp; - } - resp->next = NULL; - resp->name = xmalloc (no+1); + resp = add_entry (r); + resp->name = (char*) xmalloc (no+1); resp->value = NULL; strcpy (resp->name, fr_buf); } @@ -77,55 +93,62 @@ 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'; - if (!r->first) - resp = r->last = r->first = xmalloc (sizeof(*resp)); - else - { - resp = xmalloc (sizeof(*resp)); - r->last->next = resp; - r->last = resp; - } - resp->next = NULL; - resp->name = xmalloc (no); + resp = add_entry (r); + resp->name = (char*) 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') + if (fr_buf[no] == '\0' || strchr("\n\r\f", fr_buf[no])) { + 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); + resp->value = (char*) 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; } - else if (fr_buf[no] == '\\' && fr_buf[no+1] == '\n') + else if (fr_buf[no] == '\\' && strchr ("\n\r\f", fr_buf[no+1])) { - line = fgets (fr_buf, 1023, fr); + line = fgets (fr_buf, sizeof(fr_buf)-1, fr); if (!line) { - resp->value = xmalloc (val_size); + resp->value = (char*) xmalloc (val_size); strcpy (resp->value, val_buf); break; } no = 0; } else + { val_buf[val_size++] = fr_buf[no++]; + if (val_size+1 >= val_max) + { + char *nb; + + nb = (char*) xmalloc (val_max+=1024); + memcpy (nb, val_buf, val_size); + xfree (val_buf); + val_buf = nb; + } + } } } } @@ -133,16 +156,30 @@ static void reread (Res r) fclose (fr); } -Res res_open (const char *name) +Res res_open (const char *name, Res def_res) { - Res r = xmalloc (sizeof(*r)); + Res r; +#ifdef WIN32 + if (access (name, 4)) +#else + if (access (name, R_OK)) +#endif + { + logf (LOG_WARN|LOG_ERRNO, "Cannot access resource file `%s'", name); + return 0; + } + r = (Res) xmalloc (sizeof(*r)); r->init = 0; + r->first = r->last = NULL; r->name = xstrdup (name); + r->def_res = def_res; return r; } void res_close (Res r) { + if (!r) + return; if (r->init) { struct res_entry *re, *re1; @@ -156,53 +193,77 @@ void res_close (Res r) xfree (re); } } + xfree (r->name); xfree (r); } -const char *res_get (Res r, const char *name) +char *res_get (Res r, const char *name) { struct res_entry *re; + + if (!r) + return 0; 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; + + return res_get (r->def_res, name); +} + +char *res_get_def (Res r, const char *name, char *def) +{ + char *t; + + if (!(t = res_get (r, name))) + { + logf (LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def); + return def; + } + else + 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) + cn = s; + 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; + assert (r); 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)) { xfree (re->value); re->value = xstrdup (value); return; } - if (!r->first) - re = r->last = r->first = xmalloc (sizeof(*re)); - else - { - re = xmalloc (sizeof(*re)); - r->last->next = re; - r->last = re; - } - re->next = NULL; + re = add_entry (r); re->name = xstrdup (name); re->value = xstrdup (value); } -void res_trav (Res r, const char *prefix, - void (*f)(const char *name, const char *value)) +int 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; - + int no = 0; + + if (!r) + return 0; if (prefix) l = strlen(prefix); if (!r->init) @@ -210,14 +271,63 @@ 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); + no++; + } + if (!no) + return res_trav (r->def_res, prefix, p, f); + return no; } int res_write (Res r) { + struct res_entry *re; + FILE *fr; + + assert (r); if (!r->init) reread (r); + fr = fopen (r->name, "w"); + if (!fr) + { + logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", r->name); + exit (1); + } + + for (re = r->first; re; re=re->next) + { + int no = 0; + int lefts = strlen(re->name)+2; + + if (!re->value) + fprintf (fr, "%s\n", re->name); + else + { + fprintf (fr, "%s: ", re->name); + while (lefts + strlen(re->value+no) > 78) + { + int i = 20; + int ind = no+ 78-lefts; + while (--i >= 0) + { + if (re->value[ind] == ' ') + break; + --ind; + } + if (i<0) + ind = no + 78 - lefts; + for (i = no; i != ind; i++) + putc (re->value[i], fr); + fprintf (fr, "\\\n"); + no=ind; + lefts = 0; + } + fprintf (fr, "%s\n", re->value+no); + } + } + fclose (fr); return 0; }