X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fres.c;h=e105e596db1b7725b675ed1ac76ad9761e6873c6;hp=4714c68b0d980e78ac7678a5d4d496abeed7555c;hb=9b46631dae8ab93da1e8f87f5d6638a493135c03;hpb=5368365d44ba3ecb0d6d5755aa8419e6be4ebc66 diff --git a/util/res.c b/util/res.c index 4714c68..e105e59 100644 --- a/util/res.c +++ b/util/res.c @@ -1,5 +1,5 @@ -/* $Id: res.c,v 1.42 2005-06-13 10:27:52 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: res.c,v 1.53 2006-12-05 14:06:30 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include @@ -26,13 +26,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include #include +#define YLOG_RES 0 + struct res_entry { char *name; char *value; @@ -40,23 +43,29 @@ struct res_entry { }; struct res_struct { + int ref_count; struct res_entry *first, *last; - char *name; - int init; Res def_res; Res over_res; }; -static struct res_entry *add_entry (Res r) +static Res res_incref(Res r) +{ + if (r) + r->ref_count++; + return r; +} + +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)); + (struct res_entry *) xmalloc(sizeof(*resp)); else { - resp = (struct res_entry *) xmalloc (sizeof(*resp)); + resp = (struct res_entry *) xmalloc(sizeof(*resp)); r->last->next = resp; r->last = resp; } @@ -133,7 +142,7 @@ static char *xstrdup_env(const char *src) return dst; } -static void reread (Res r) +ZEBRA_RES res_read_file(Res r, const char *fname) { struct res_entry *resp; char *line; @@ -142,38 +151,21 @@ static void reread (Res r) char fr_buf[1024]; FILE *fr; - assert (r); - r->init = 1; + assert(r); - if (!r->name) - return; - - fr = fopen (r->name, "r"); + fr = fopen(fname, "r"); if (!fr) { - yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", r->name); - return ; + yaz_log(YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", fname); + return ZEBRA_FAIL; } - val_buf = (char*) xmalloc (val_max); + val_buf = (char*) xmalloc(val_max); while (1) { - line = fgets (fr_buf, sizeof(fr_buf)-1, fr); + line = fgets(fr_buf, sizeof(fr_buf)-1, fr); if (!line) break; - if (*line == '#') - { - int no = 0; - - while (fr_buf[no] && fr_buf[no] != '\n') - no++; - fr_buf[no] = '\0'; - - resp = add_entry (r); - resp->name = (char*) xmalloc (no+1); - resp->value = NULL; - strcpy (resp->name, fr_buf); - } - else + if (*line != '#') { int no = 0; while (1) @@ -183,18 +175,18 @@ static void reread (Res r) no = 0; break; } - if (strchr (": \t", fr_buf[no])) + if (strchr(": \t", fr_buf[no])) break; no++; } if (!no) continue; fr_buf[no++] = '\0'; - resp = add_entry (r); - resp->name = (char*) xmalloc (no); - strcpy (resp->name, fr_buf); + resp = add_entry(r); + resp->name = (char*) xmalloc(no); + strcpy(resp->name, fr_buf); - while (strchr (" \t", fr_buf[no])) + while (strchr(" \t", fr_buf[no])) no++; val_size = 0; while (1) @@ -207,13 +199,13 @@ static void reread (Res r) val_size--; val_buf[val_size] = '\0'; resp->value = xstrdup_env(val_buf); - yaz_log (YLOG_DEBUG, "(name=%s,value=%s)", + yaz_log(YLOG_DEBUG, "(name=%s,value=%s)", resp->name, resp->value); break; } - else if (fr_buf[no] == '\\' && strchr ("\n\r\f", fr_buf[no+1])) + else if (fr_buf[no] == '\\' && strchr("\n\r\f", fr_buf[no+1])) { - line = fgets (fr_buf, sizeof(fr_buf)-1, fr); + line = fgets(fr_buf, sizeof(fr_buf)-1, fr); if (!line) { val_buf[val_size] = '\0'; @@ -229,69 +221,59 @@ static void reread (Res r) { char *nb; - nb = (char*) xmalloc (val_max+=1024); - memcpy (nb, val_buf, val_size); - xfree (val_buf); + nb = (char*) xmalloc(val_max+=1024); + memcpy(nb, val_buf, val_size); + xfree(val_buf); val_buf = nb; } } } } } - xfree (val_buf); - fclose (fr); + xfree(val_buf); + fclose(fr); + return ZEBRA_OK; } -Res res_open (const char *name, Res def_res, Res over_res) +Res res_open(Res def_res, Res over_res) { Res r; + r = (Res) xmalloc(sizeof(*r)); + + r->ref_count = 1; + r->first = r->last = NULL; + r->def_res = res_incref(def_res); + r->over_res = res_incref(over_res); + return r; +} - if (name) +void res_clear(Res r) +{ + struct res_entry *re, *re1; + for (re = r->first; re; re=re1) { -#ifdef WIN32 - if (access (name, 4)) -#else - if (access (name, R_OK)) -#endif - { - yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", name); - return 0; - } + if (re->name) + xfree(re->name); + if (re->value) + xfree(re->value); + re1 = re->next; + xfree(re); } - r = (Res) xmalloc (sizeof(*r)); - r->init = 0; r->first = r->last = NULL; - if (name) - r->name = xstrdup (name); - else - r->name=0; - r->def_res = def_res; - r->over_res = over_res; - return r; } -void res_close (Res r) +void res_close(Res r) { - if (!r) - return; - if (r->init) + if (r && --(r->ref_count) == 0) { - struct res_entry *re, *re1; - for (re = r->first; re; re=re1) - { - if (re->name) - xfree (re->name); - if (re->value) - xfree (re->value); - re1 = re->next; - xfree (re); - } + res_clear(r); + res_close(r->def_res); + res_close(r->over_res); + xfree(r); } - xfree (r->name); - xfree (r); } -const char *res_get_prefix (Res r, const char *name, const char *prefix, +const char *res_get_prefix(Res r, const char *name, const char *prefix, const char *def) { const char *v = 0;; @@ -313,7 +295,7 @@ const char *res_get_prefix (Res r, const char *name, const char *prefix, return v; } -const char *res_get (Res r, const char *name) +const char *res_get(Res r, const char *name) { struct res_entry *re; const char *v; @@ -325,59 +307,56 @@ const char *res_get (Res r, const char *name) if (v) return v; - if (!r->init) - reread (r); for (re = r->first; re; re=re->next) - if (re->value && !yaz_matchstr (re->name, name)) + if (re->value && !yaz_matchstr(re->name, name)) return re->value; - return res_get (r->def_res, name); + return res_get(r->def_res, name); } -const char *res_get_def (Res r, const char *name, const char *def) +const char *res_get_def(Res r, const char *name, const char *def) { const char *t; - if (!(t = res_get (r, name))) + if (!(t = res_get(r, name))) { - yaz_log (YLOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def); + if (def) + yaz_log(YLOG_DEBUG, "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) +int res_get_match(Res r, const char *name, const char *value, const char *s) { - const char *cn = res_get (r, name); + const char *cn = res_get(r, name); if (!cn) cn = s; - if (cn && !yaz_matchstr (cn, value)) + if (cn && !yaz_matchstr(cn, value)) return 1; return 0; } -void res_set (Res r, const char *name, const char *value) +void res_set(Res r, const char *name, const char *value) { struct res_entry *re; - assert (r); - if (!r->init) - reread (r); + assert(r); for (re = r->first; re; re=re->next) - if (re->value && !yaz_matchstr (re->name, name)) + if (re->value && !yaz_matchstr(re->name, name)) { - xfree (re->value); - re->value = xstrdup_env (value); + xfree(re->value); + re->value = xstrdup_env(value); return; } - re = add_entry (r); - re->name = xstrdup (name); - re->value = xstrdup_env (value); + re = add_entry(r); + re->name = xstrdup(name); + re->value = xstrdup_env(value); } -int res_trav (Res r, const char *prefix, void *p, +int res_trav(Res r, const char *prefix, void *p, void (*f)(void *p, const char *name, const char *value)) { struct res_entry *re; @@ -386,38 +365,35 @@ int res_trav (Res r, const char *prefix, void *p, if (!r) return 0; + no = res_trav(r->over_res, prefix, p, f); + if (no) + return no; if (prefix) l = strlen(prefix); - if (!r->init) - reread (r); for (re = r->first; re; re=re->next) if (re->value) - if (l==0 || !memcmp (re->name, prefix, l)) + if (l==0 || !memcmp(re->name, prefix, l)) { (*f)(p, re->name, re->value); no++; } if (!no) - return res_trav (r->def_res, prefix, p, f); + return res_trav(r->def_res, prefix, p, f); return no; } -int res_write (Res r) +ZEBRA_RES res_write_file(Res r, const char *fname) { struct res_entry *re; FILE *fr; - assert (r); - if (!r->init) - reread (r); - if (!r->name) - return 0; /* ok, this was not from a file */ - fr = fopen (r->name, "w"); + assert(r); + fr = fopen(fname, "w"); if (!fr) { - yaz_log (YLOG_FATAL|YLOG_ERRNO, "Cannot create `%s'", r->name); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Cannot create `%s'", fname); + return ZEBRA_FAIL; } for (re = r->first; re; re=re->next) @@ -426,10 +402,10 @@ int res_write (Res r) int lefts = strlen(re->name)+2; if (!re->value) - fprintf (fr, "%s\n", re->name); + fprintf(fr, "%s\n", re->name); else { - fprintf (fr, "%s: ", re->name); + fprintf(fr, "%s: ", re->name); while (lefts + strlen(re->value+no) > 78) { int i = 20; @@ -443,16 +419,16 @@ int res_write (Res r) if (i<0) ind = no + 78 - lefts; for (i = no; i != ind; i++) - putc (re->value[i], fr); - fprintf (fr, "\\\n"); + putc(re->value[i], fr); + fprintf(fr, "\\\n"); no=ind; lefts = 0; } - fprintf (fr, "%s\n", re->value+no); + fprintf(fr, "%s\n", re->value+no); } } - fclose (fr); - return 0; + fclose(fr); + return ZEBRA_OK; } ZEBRA_RES res_get_int(Res r, const char *name, int *val) @@ -466,3 +442,178 @@ ZEBRA_RES res_get_int(Res r, const char *name, int *val) } return ZEBRA_FAIL; } + +/* == pop ================================================================= */ +Res res_add_over (Res p, Res t) +{ + if ((!p) || (!t)) + return (0); + + while (p->over_res) + p = p->over_res; + + p->over_res = t; + return (p); +} + +void res_remove_over (Res r) +{ + if (!r) + return; + r->over_res = 0; +} + +void res_close_over (Res r) +{ + if (!r) + return; + if (r->over_res) + res_close(r->over_res); + r->over_res = 0; +} + +void res_add (Res r, const char *name, const char *value) +{ + struct res_entry *re; + assert(r); + assert(name); + assert(value); + yaz_log (YLOG_RES, "res_add res=%p, name=%s, value=%s", r, name, value); + re = add_entry (r); + re->name = xstrdup (name); + re->value = xstrdup_env (value); +} + +char **res_2_array (Res r) +{ + struct res_entry *re; + int i = 0; + char **list; + + if (!r) + return 0; + + list = xmalloc(sizeof(char *)); + + for (re = r->first; re; re=re->next) { + list = xrealloc(list, ((i+3) * sizeof(char *))); + list[i++] = strdup(re->name); + if (re->value) + list[i++] = strdup(re->value); + else + list[i++] = strdup(""); + yaz_log(YLOG_RES, "res2array: %s=%s",re->name, re->value); + } + list[i++] = 0; + return (list); +} + +char **res_get_array(Res r, const char* name) +{ + struct res_entry *re; + int i = 0; + char **list; + + if (!r) + return 0; + + list = xmalloc(sizeof(char *)); + + for (re = r->first; re; re=re->next) + if (re->value && !yaz_matchstr (re->name, name)) + { + list = xrealloc(list, (i+2) * sizeof(char *)); + list[i++] = xstrdup(re->value); + } + + if (i == 0) + return (res_get_array(r->def_res, name)); + + list[i++] = 0; + return (list); +} + +void res_dump (Res r, int level) +{ + struct res_entry *re; + + if (!r) + return; + + for (re = r->first; re; re=re->next) { + printf("%*s - %s:='%s'\n",level * 4,"",re->name,re->value); + } + + if (r->def_res) { + printf ("%*s DEF ",level * 4,""); + res_dump (r->def_res, level + 1); + } + + if (r->over_res) { + printf ("%*s OVER ",level * 4,""); + res_dump (r->over_res, level + 1); + } +} + +int res_check(Res r_i, Res r_v) +{ + struct res_entry *e_i; + int errors = 0; + + for (e_i = r_i->first; e_i; e_i = e_i->next) + { + struct res_entry *e_v; + for (e_v = r_v->first; e_v; e_v = e_v->next) + { + int prefix_allowed = 0; + int suffix_allowed = 0; + const char *name = e_i->name; + size_t name_len = strlen(e_i->name); + char namez[32]; + + if (strchr(e_v->value, 'p')) + prefix_allowed = 1; + if (strchr(e_v->value, 's')) + suffix_allowed = 1; + + if (prefix_allowed) + { + const char *cp = strchr(name, '.'); + if (cp) + { + name = cp; + name_len = strlen(name); + } + } + if (suffix_allowed) + { + const char *cp = strchr(name, '.'); + if (cp) + name_len = cp - name; + } + if (name_len < sizeof(namez)-1) + { + memcpy(namez, name, name_len); + namez[name_len] = '\0'; + if (!yaz_matchstr(namez, e_v->name)) + break; + } + } + if (!e_v) + { + yaz_log(YLOG_WARN, "The following setting is unrecognized: %s", + e_i->name); + errors++; + } + } + return errors; +} + +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +