/*
- * 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.20 1997-10-31 12:39:15 adam
+ * 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
+ * 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
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
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)
{
- 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)
{
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))
#endif
- logf (LOG_LOG|LOG_ERRNO, "Cannot access `%s'", name);
- r = xmalloc (sizeof(*r));
+ {
+ logf (LOG_LOG|LOG_ERRNO, "Cannot access resource file `%s'", name);
+ return NULL;
+ }
+ r = (Res) xmalloc (sizeof(*r));
r->init = 0;
r->first = r->last = NULL;
r->name = xstrdup (name);
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;
}