* Sebastian Hammer, Adam Dickmeiss
*
* $Log: res.c,v $
- * Revision 1.15 1996-05-22 08:23:43 adam
+ * 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
#include <stdlib.h>
#include <string.h>
#include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
#include <unistd.h>
-#include <alexutil.h>
+#endif
+
+#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)
Res res_open (const char *name)
{
Res r;
+#ifdef WINDOWS
+ if (access (name, 4))
+#else
if (access (name, R_OK))
+#endif
logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
r = xmalloc (sizeof(*r));
r->init = 0;
xfree (re);
}
}
+ xfree (r->name);
xfree (r);
}
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;
re->value = xstrdup (value);
}
-void res_trav (Res r, const char *prefix,
- void (*f)(const char *name, const char *value))
+void 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;
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);
}
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);
}