X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fres.c;h=a65e5060b15da233e8740235fc2da77993890355;hp=0864a9177e8789e66f4a5c163972b25f5d467281;hb=2b1851bd5565e3d21f9cf9a37661a584c063b75f;hpb=252d2081a943e847418dc677a4b95ebb2244ce4a diff --git a/util/res.c b/util/res.c index 0864a91..a65e506 100644 --- a/util/res.c +++ b/util/res.c @@ -1,72 +1,46 @@ /* - * 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.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.29 2002-04-04 14:14:14 adam Exp $ */ #include #include #include #include +#ifdef WIN32 +#include +#else #include -#include -#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 = 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; } @@ -80,26 +54,23 @@ static void reread (Res r) char *line; char *val_buf; int val_size, val_max = 256; - char path[256]; char fr_buf[1024]; FILE *fr; assert (r); r->init = 1; - val_buf = xmalloc (val_max); - - strcpy (path, alex_path(r->name)); + val_buf = (char*) xmalloc (val_max); - fr = fopen (path, "r"); + fr = fopen (r->name, "r"); if (!fr) { - logf (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 == '#') @@ -111,7 +82,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); } @@ -122,44 +93,44 @@ 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'; resp = add_entry (r); - resp->name = xmalloc (no); + 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); 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; } @@ -172,7 +143,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; @@ -185,21 +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; +#ifdef WIN32 + if (access (name, 4)) +#else if (access (name, R_OK)) - logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name); - r = xmalloc (sizeof(*r)); +#endif + { + logf (LOG_LOG|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) { - assert (r); + if (!r) + return; if (r->init) { struct res_entry *re, *re1; @@ -213,6 +193,7 @@ void res_close (Res r) xfree (re); } } + xfree (r->name); xfree (r); } @@ -220,13 +201,15 @@ char *res_get (Res r, const char *name) { struct res_entry *re; - assert (r); + if (!r) + return 0; 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) @@ -242,6 +225,17 @@ char *res_get_def (Res r, const char *name, char *def) 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; @@ -261,13 +255,15 @@ void res_put (Res r, const char *name, const char *value) 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; - - assert (r); + int no = 0; + + if (!r) + return 0; if (prefix) l = strlen(prefix); if (!r->init) @@ -275,25 +271,28 @@ 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; - char path[256]; FILE *fr; assert (r); if (!r->init) reread (r); - strcpy (path, alex_path(r->name)); - - fr = fopen (path, "w"); + fr = fopen (r->name, "w"); if (!fr) { - logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", path); + logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", r->name); exit (1); }