X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=202d35129ab9c1da8bbbb3c66fe57f255d199ecc;hb=b9bbdf9c3eb24d29c3181c693204d7cb790bc318;hp=4e25261acd819a01839b7aa94b6afe8898fccf47;hpb=eaa8c71186392f0d2a1ab714dc6f3f0a4da71d03;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index 4e25261..202d351 100644
--- a/util/res.c
+++ b/util/res.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data ApS
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.20  1997-10-31 12:39:15  adam
+ * 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
@@ -112,8 +121,8 @@ static void reread (Res r)
     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)
     {
@@ -159,7 +168,7 @@ static void reread (Res r)
             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] == ' ' ||
@@ -172,7 +181,7 @@ static void reread (Res r)
                          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)
@@ -211,7 +220,10 @@ Res res_open (const char *name)
 #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;
@@ -293,12 +305,13 @@ void res_put (Res r, const char *name, const char *value)
     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);
@@ -307,7 +320,11 @@ void res_trav (Res r, const char *prefix, void *p,
     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;
 }