* Sebastian Hammer, Adam Dickmeiss
*
* $Log: res.c,v $
- * Revision 1.13 1995-09-04 12:34:05 adam
+ * 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
#include <string.h>
#include <assert.h>
#include <unistd.h>
-#include <alexutil.h>
+
+#include <zebrautl.h>
+#include <yaz-util.h>
static struct res_entry *add_entry (Res r)
{
char *line;
char *val_buf;
int val_size, val_max = 256;
- char path[256];
char fr_buf[1024];
FILE *fr;
val_buf = xmalloc (val_max);
- strcpy (path, alex_path(r->name));
-
- fr = fopen (path, "r");
+ fr = fopen (r->name, "r");
if (!fr)
{
- logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", path);
+ logf (LOG_FATAL|LOG_ERRNO, "Cannot open %s", r->name);
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);
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;
}
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 && !yaz_matchstr (cn, value))
+ return 1;
+ return 0;
+}
+
void res_put (Res r, const char *name, const char *value)
{
struct res_entry *re;
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);
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);
}