X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=6ce039c351c5d48f7d00be188e456a2165df9fa4;hb=0e56fa84bb4a5985c19a21926e86862c08d84689;hp=4e25261acd819a01839b7aa94b6afe8898fccf47;hpb=eaa8c71186392f0d2a1ab714dc6f3f0a4da71d03;p=idzebra-moved-to-github.git diff --git a/util/res.c b/util/res.c index 4e25261..6ce039c 100644 --- a/util/res.c +++ b/util/res.c @@ -1,93 +1,62 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: res.c,v $ - * 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 - * Bug fix. - * - * Revision 1.11 1994/10/05 16:54:52 adam - * Minor changes. - * - * Revision 1.10 1994/10/05 10:47:31 adam - * Small bug fix. - * - * Revision 1.9 1994/09/16 14:41:12 quinn - * Added log warning to res_get_def - * - * Revision 1.8 1994/09/16 14:37:12 quinn - * added res_get_def - * - * Revision 1.7 1994/09/06 13:01:03 quinn - * Removed const from declaration of res_get - * - * Revision 1.6 1994/09/01 17:45:14 adam - * Work on resource manager. - * - * Revision 1.5 1994/08/18 11:02:28 adam - * Implementation of res_write. - * - * 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.38 2004-11-19 10:27:18 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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. +*/ + #include #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include #endif #include -#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; + Res over_res; +}; static struct res_entry *add_entry (Res r) { struct res_entry *resp; if (!r->first) - resp = r->last = r->first = xmalloc (sizeof(*resp)); + resp = r->last = r->first = + (struct res_entry *) xmalloc (sizeof(*resp)); else { - resp = xmalloc (sizeof(*resp)); + resp = (struct res_entry *) xmalloc (sizeof(*resp)); r->last->next = resp; r->last = resp; } @@ -95,6 +64,75 @@ static struct res_entry *add_entry (Res r) return resp; } +static char *xstrdup_env(const char *src) +{ + int i = 0; + int j = 0; + char *dst; + int env_strlen = 0; + + while (src[i]) + { + if (src[i] == '$' && src[i+1] == '{') + { + char envname[128]; + char *env_val; + int k = 0; + i = i + 2; + while (k < 127 && src[i] && !strchr(":}\n\r\f", src[i])) + envname[k++] = src[i++]; + envname[k] = '\0'; + + env_val = getenv(envname); + if (env_val) + env_strlen += 1 + strlen(env_val); + else + env_strlen++; + while (src[i] && !strchr("}\n\r\f", src[i])) + i++; + if (src[i] == '}') + i++; + } + else + i++; + } + dst = xmalloc(1 + env_strlen + i); + i = 0; + while (src[i]) + { + if (src[i] == '$' && src[i+1] == '{') + { + char envname[128]; + char *env_val; + int k = 0; + i = i + 2; + while(k < 127 && src[i] && !strchr(":}\n\r\f", src[i])) + envname[k++] = src[i++]; + envname[k] = '\0'; + env_val = getenv(envname); + if (env_val) + { + strcpy(dst+j, env_val); + j += strlen(env_val); + } + else if (src[i] == ':' && src[i+1] == '-') + { + i = i + 2; + while (src[i] && !strchr("}\n\r\f", src[i])) + dst[j++] = src[i++]; + } + while (src[i] && !strchr("}\n\r\f", src[i])) + i++; + if (src[i] == '}') + i++; + } + else + dst[j++] = src[i++]; + } + dst[j] = '\0'; + return dst; +} + static void reread (Res r) { struct res_entry *resp; @@ -107,14 +145,16 @@ static void reread (Res r) assert (r); r->init = 1; - val_buf = xmalloc (val_max); + if (!r->name) + return; fr = fopen (r->name, "r"); if (!fr) { - logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", r->name); - exit (1); + yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", r->name); + return ; } + val_buf = (char*) xmalloc (val_max); while (1) { line = fgets (fr_buf, sizeof(fr_buf)-1, fr); @@ -129,7 +169,7 @@ static void reread (Res r) fr_buf[no] = '\0'; resp = add_entry (r); - resp->name = xmalloc (no+1); + resp->name = (char*) xmalloc (no+1); resp->value = NULL; strcpy (resp->name, fr_buf); } @@ -151,7 +191,7 @@ static void reread (Res r) continue; fr_buf[no++] = '\0'; resp = add_entry (r); - resp->name = xmalloc (no); + resp->name = (char*) xmalloc (no); strcpy (resp->name, fr_buf); while (strchr (" \t", fr_buf[no])) @@ -159,26 +199,25 @@ static void reread (Res r) 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); - strcpy (resp->value, val_buf); - logf (LOG_DEBUG, "(name=%s,value=%s)", + val_buf[val_size] = '\0'; + resp->value = xstrdup_env(val_buf); + yaz_log (YLOG_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, sizeof(fr_buf)-1, fr); if (!line) { - resp->value = xmalloc (val_size); - strcpy (resp->value, val_buf); + val_buf[val_size] = '\0'; + resp->value = xstrdup_env(val_buf); break; } no = 0; @@ -190,7 +229,7 @@ static void reread (Res r) { char *nb; - nb = xmalloc (val_max+=1024); + nb = (char*) xmalloc (val_max+=1024); memcpy (nb, val_buf, val_size); xfree (val_buf); val_buf = nb; @@ -203,25 +242,38 @@ static void reread (Res r) fclose (fr); } -Res res_open (const char *name) +Res res_open (const char *name, Res def_res, Res over_res) { Res r; -#ifdef WINDOWS - if (access (name, 4)) + + if (name) + { +#ifdef WIN32 + if (access (name, 4)) #else - if (access (name, R_OK)) + if (access (name, R_OK)) #endif - logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name); - r = xmalloc (sizeof(*r)); + { + yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", name); + return 0; + } + } + r = (Res) xmalloc (sizeof(*r)); r->init = 0; r->first = r->last = NULL; - r->name = xstrdup (name); + 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) { - assert (r); + if (!r) + return; if (r->init) { struct res_entry *re, *re1; @@ -239,26 +291,56 @@ void res_close (Res r) xfree (r); } -char *res_get (Res r, const char *name) +const char *res_get_prefix (Res r, const char *name, const char *prefix, + const char *def) +{ + const char *v = 0;; + if (prefix) + { + char rname[128]; + + if (strlen(name) + strlen(prefix) >= (sizeof(rname)-2)) + return 0; + strcpy(rname, prefix); + strcat(rname, "."); + strcat(rname, name); + v = res_get(r, rname); + } + if (!v) + v = res_get(r, name); + if (!v) + v = def; + return v; +} + +const char *res_get (Res r, const char *name) { struct res_entry *re; + const char *v; + + if (!r) + return 0; + + v = res_get(r->over_res, name); + if (v) + return v; - assert (r); if (!r->init) reread (r); for (re = r->first; re; re=re->next) 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) +const char *res_get_def (Res r, const char *name, const char *def) { - char *t; + const char *t; if (!(t = res_get (r, name))) { - logf (LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def); + yaz_log (YLOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def); return def; } else @@ -269,12 +351,14 @@ 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) +void res_set (Res r, const char *name, const char *value) { struct res_entry *re; assert (r); @@ -285,21 +369,23 @@ void res_put (Res r, const char *name, const char *value) if (re->value && !yaz_matchstr (re->name, name)) { xfree (re->value); - re->value = xstrdup (value); + re->value = xstrdup_env (value); return; } re = add_entry (r); re->name = xstrdup (name); - re->value = xstrdup (value); + re->value = xstrdup_env (value); } -void res_trav (Res r, const char *prefix, void *p, - void (*f)(void *p, 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; - - assert (r); + int no = 0; + + if (!r) + return 0; if (prefix) l = strlen(prefix); if (!r->init) @@ -307,7 +393,13 @@ void res_trav (Res r, const char *prefix, void *p, for (re = r->first; re; re=re->next) if (re->value) 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 no; } @@ -319,10 +411,12 @@ int res_write (Res r) assert (r); if (!r->init) reread (r); + if (!r->name) + return 0; /* ok, this was not from a file */ fr = fopen (r->name, "w"); if (!fr) { - logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", r->name); + yaz_log (YLOG_FATAL|YLOG_ERRNO, "Cannot create `%s'", r->name); exit (1); } @@ -361,5 +455,3 @@ int res_write (Res r) return 0; } - -