X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=cbc51ec560757e38af71556da300420ff90bb4ce;hb=9f7d2fac648dbdba81e007f08ba3fbbb33c273b9;hp=b21e706e6f9f49994e850aa7a6bb0720ebb7fd1a;hpb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;p=idzebra-moved-to-github.git diff --git a/util/res.c b/util/res.c index b21e706..cbc51ec 100644 --- a/util/res.c +++ b/util/res.c @@ -1,86 +1,26 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: res.c,v $ - * Revision 1.25 1999-05-26 07:49:14 adam - * C++ compilation. - * - * Revision 1.24 1999/02/02 14:51:42 adam - * Updated WIN32 code specific sections. Changed header. - * - * Revision 1.23 1998/10/28 15:18:55 adam - * Fix for DOS-formatted configuration files. - * - * Revision 1.22 1998/01/12 15:04:32 adam - * Removed exit - call. - * - * Revision 1.21 1997/11/18 10:04:03 adam - * Function res_trav returns number of 'hits'. - * - * 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.36 2004-06-15 08:05:54 adam 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 @@ -92,7 +32,21 @@ #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) { @@ -111,6 +65,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; @@ -125,10 +148,13 @@ static void reread (Res r) val_buf = (char*) xmalloc (val_max); + if (!r->name) + return; + fr = fopen (r->name, "r"); if (!fr) { - logf (LOG_WARN|LOG_ERRNO, "Cannot open %s", r->name); + logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", r->name); return ; } while (1) @@ -181,9 +207,8 @@ static void reread (Res r) (val_buf[val_size-1] == ' ' || val_buf[val_size-1] == '\t')) val_size--; - val_buf[val_size++] = '\0'; - resp->value = (char*) xmalloc (val_size); - strcpy (resp->value, val_buf); + val_buf[val_size] = '\0'; + resp->value = xstrdup_env(val_buf); logf (LOG_DEBUG, "(name=%s,value=%s)", resp->name, resp->value); break; @@ -193,8 +218,8 @@ static void reread (Res r) line = fgets (fr_buf, sizeof(fr_buf)-1, fr); if (!line) { - resp->value = (char*) xmalloc (val_size); - strcpy (resp->value, val_buf); + val_buf[val_size] = '\0'; + resp->value = xstrdup_env(val_buf); break; } no = 0; @@ -219,28 +244,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; + + if (name) + { #ifdef WIN32 - if (access (name, 4)) + if (access (name, 4)) #else - if (access (name, R_OK)) + if (access (name, R_OK)) #endif - { - logf (LOG_LOG|LOG_ERRNO, "Cannot access resource file `%s'", name); - return NULL; + { + logf (LOG_WARN|LOG_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; @@ -258,22 +293,52 @@ 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))) { @@ -288,12 +353,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); @@ -304,12 +371,12 @@ 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); } int res_trav (Res r, const char *prefix, void *p, @@ -319,7 +386,8 @@ int res_trav (Res r, const char *prefix, void *p, int l = 0; int no = 0; - assert (r); + if (!r) + return 0; if (prefix) l = strlen(prefix); if (!r->init) @@ -331,6 +399,8 @@ int res_trav (Res r, const char *prefix, void *p, (*f)(p, re->name, re->value); no++; } + if (!no) + return res_trav (r->def_res, prefix, p, f); return no; } @@ -343,10 +413,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); + logf (LOG_FATAL|LOG_ERRNO, "Cannot create `%s'", r->name); exit (1); } @@ -385,5 +457,3 @@ int res_write (Res r) return 0; } - -