* Sebastian Hammer, Adam Dickmeiss
*
* $Log: res.c,v $
- * Revision 1.5 1994-08-18 11:02:28 adam
+ * 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
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include <util.h>
+#include <unistd.h>
+#include <alexutil.h>
+#include <yaz-util.h>
static struct res_entry *add_entry (Res r)
{
char fr_buf[1024];
FILE *fr;
+ assert (r);
r->init = 1;
val_buf = xmalloc (val_max);
fr = fopen (path, "r");
if (!fr)
{
- log (LOG_FATAL|LOG_ERRNO, "cannot open %s", path);
+ logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", path);
exit (1);
}
while (1)
{
if (fr_buf[no] == '\0' || fr_buf[no] == '\n')
{
+ 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);
- log (LOG_DEBUG, "(name=%s,value=%s)",
+ logf (LOG_DEBUG, "(name=%s,value=%s)",
resp->name, resp->value);
break;
}
Res res_open (const char *name)
{
- Res r = xmalloc (sizeof(*r));
+ Res r;
+ if (access (name, R_OK))
+ logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
+ r = xmalloc (sizeof(*r));
r->init = 0;
+ r->first = r->last = NULL;
r->name = xstrdup (name);
return r;
}
void res_close (Res r)
{
+ assert (r);
if (r->init)
{
struct res_entry *re, *re1;
xfree (r);
}
-const char *res_get (Res r, const char *name)
+char *res_get (Res r, const char *name)
{
struct res_entry *re;
+
+ assert (r);
if (!r->init)
reread (r);
-
for (re = r->first; re; re=re->next)
- if (re->value && !strcmp (re->name, name))
+ if (re->value && !yaz_matchstr (re->name, name))
return re->value;
return NULL;
}
+char *res_get_def (Res r, const char *name, char *def)
+{
+ char *t;
+
+ if (!(t = res_get (r, name)))
+ {
+ logf (LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
+ return def;
+ }
+ else
+ return t;
+}
+
void res_put (Res r, const char *name, const char *value)
{
struct res_entry *re;
+ assert (r);
if (!r->init)
reread (r);
for (re = r->first; re; re=re->next)
- if (re->value && !strcmp (re->name, name))
+ if (re->value && !yaz_matchstr (re->name, name))
{
xfree (re->value);
re->value = xstrdup (value);
struct res_entry *re;
int l = 0;
+ assert (r);
if (prefix)
l = strlen(prefix);
if (!r->init)
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");
if (!fr)
{
- log (LOG_FATAL|LOG_ERRNO, "cannot create %s", path);
+ logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", path);
exit (1);
}