X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=7b304544d23292bfe99ce79af59f18e845821d1d;hb=afbef0c68dc14c3c81b7f83dfd5f296bfcaefa59;hp=c5ebceae2065eae61cbaf8cbe7b6f1530c71e177;hpb=7f02bad575a64004a3a0122a99666afd41dd8966;p=idzebra-moved-to-github.git diff --git a/util/res.c b/util/res.c index c5ebcea..7b30454 100644 --- a/util/res.c +++ b/util/res.c @@ -1,5 +1,5 @@ -/* $Id: res.c,v 1.46 2005-09-15 09:27:18 pop Exp $ - Copyright (C) 1995-2005 +/* $Id: res.c,v 1.52 2006-12-05 09:24:31 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 @@ -43,11 +43,19 @@ struct res_entry { }; struct res_struct { + int ref_count; struct res_entry *first, *last; Res def_res; Res over_res; }; +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; @@ -226,13 +234,16 @@ ZEBRA_RES res_read_file(Res r, const char *fname) fclose(fr); return ZEBRA_OK; } + 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 = def_res; - r->over_res = over_res; + r->def_res = res_incref(def_res); + r->over_res = res_incref(over_res); return r; } @@ -253,11 +264,13 @@ void res_clear(Res r) void res_close(Res r) { - if (!r) - return; - res_clear(r); - - xfree(r); + if (r && --(r->ref_count) == 0) + { + res_clear(r); + res_close(r->def_res); + res_close(r->over_res); + xfree(r); + } } const char *res_get_prefix(Res r, const char *name, const char *prefix, @@ -307,7 +320,8 @@ const char *res_get_def(Res r, const char *name, const char *def) 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 @@ -379,7 +393,7 @@ ZEBRA_RES res_write_file(Res r, const char *fname) if (!fr) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "Cannot create `%s'", fname); - exit(1); + return ZEBRA_FAIL; } for (re = r->first; re; re=re->next) @@ -433,10 +447,10 @@ ZEBRA_RES res_get_int(Res r, const char *name, int *val) Res res_add_over (Res p, Res t) { if ((!p) || (!t)) - return (0); - + return (0); + while (p->over_res) - p = p->over_res; + p = p->over_res; p->over_res = t; return (p); @@ -454,20 +468,20 @@ void res_close_over (Res r) if (!r) return; if (r->over_res) - res_close(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); - if ((name) && (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); + 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) @@ -475,70 +489,76 @@ char **res_2_array (Res r) struct res_entry *re; int i = 0; char **list; - + if (!r) - return 0; - + 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 = 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); + 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); + 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; - - printf ("RES:\n", level * 4,""); - - 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); - } + 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); + } } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +