/*
- * Copyright (C) 1994, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: res.c,v $
- * Revision 1.22 1998-01-12 15:04:32 adam
+ * Revision 1.28 2000-12-01 17:59:08 adam
+ * Fixed bug regarding online updates on WIN32.
+ * When zebra.cfg is not available the server will not abort.
+ *
+ * Revision 1.27 1999/11/30 13:48:04 adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.26 1999/10/07 09:48:36 adam
+ * Allow res_get / res_get_def with NULL res.
+ *
+ * Revision 1.25 1999/05/26 07:49:14 adam
+ * C++ compilation.
+ *
+ * Revision 1.24 1999/02/02 14:51:42 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.23 1998/10/28 15:18:55 adam
+ * Fix for DOS-formatted configuration files.
+ *
+ * Revision 1.22 1998/01/12 15:04:32 adam
* Removed exit - call.
*
* Revision 1.21 1997/11/18 10:04:03 adam
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
#include <zebrautl.h>
-#include <yaz-util.h>
+#include <yaz/yaz-util.h>
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;
}
assert (r);
r->init = 1;
- val_buf = xmalloc (val_max);
+ val_buf = (char*) xmalloc (val_max);
fr = fopen (r->name, "r");
if (!fr)
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);
}
continue;
fr_buf[no++] = '\0';
resp = add_entry (r);
- resp->name = xmalloc (no);
+ resp->name = (char*) xmalloc (no);
strcpy (resp->name, fr_buf);
while (strchr (" \t", fr_buf[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, sizeof(fr_buf)-1, fr);
if (!line)
{
- resp->value = xmalloc (val_size);
+ resp->value = (char*) xmalloc (val_size);
strcpy (resp->value, val_buf);
break;
}
{
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;
Res res_open (const char *name)
{
Res r;
-#ifdef WINDOWS
+#ifdef WIN32
if (access (name, 4))
#else
if (access (name, R_OK))
logf (LOG_LOG|LOG_ERRNO, "Cannot access resource file `%s'", name);
return NULL;
}
- r = xmalloc (sizeof(*r));
+ r = (Res) xmalloc (sizeof(*r));
r->init = 0;
r->first = r->last = NULL;
r->name = xstrdup (name);
void res_close (Res r)
{
- assert (r);
+ if (!r)
+ return;
if (r->init)
{
struct res_entry *re, *re1;
{
struct res_entry *re;
- assert (r);
+ if (!r)
+ return NULL;
if (!r->init)
reread (r);
for (re = r->first; re; re=re->next)
{
const char *cn = res_get (r, name);
+ if (!cn)
+ cn = s;
if (cn && !yaz_matchstr (cn, value))
return 1;
return 0;
int l = 0;
int no = 0;
- assert (r);
+ if (!r)
+ return 0;
if (prefix)
l = strlen(prefix);
if (!r->init)