* Sebastian Hammer, Adam Dickmeiss
*
* $Log: res.c,v $
- * Revision 1.18 1997-09-17 12:19:24 adam
+ * 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.
*
fr = fopen (r->name, "r");
if (!fr)
{
- logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", r->name);
- 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 == '#')
{
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);
strcpy (resp->name, fr_buf);
- while (fr_buf[no] == ' ')
+ while (strchr (" \t", fr_buf[no]))
no++;
val_size = 0;
while (1)
}
else if (fr_buf[no] == '\\' && fr_buf[no+1] == '\n')
{
- line = fgets (fr_buf, 1023, fr);
+ line = fgets (fr_buf, sizeof(fr_buf)-1, fr);
if (!line)
{
resp->value = xmalloc (val_size);
#else
if (access (name, R_OK))
#endif
- logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
+ {
+ logf (LOG_LOG|LOG_ERRNO, "Cannot access resource file `%s'", name);
+ return NULL;
+ }
r = xmalloc (sizeof(*r));
r->init = 0;
r->first = r->last = NULL;
xfree (re);
}
}
+ xfree (r->name);
xfree (r);
}
re->value = xstrdup (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;
-
+ int no = 0;
+
assert (r);
if (prefix)
l = strlen(prefix);
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++;
+ }
+ return no;
}