X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=571064852cc8e9b6f39552c5787fd41ddbe17984;hb=3db15cf883ad80b6a4b0e960f3c3b59c86b59c6b;hp=78457d5c75a6ad4d5d62fa0590f1f9190fcc66bf;hpb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index 78457d5..5710648 100644
--- a/util/res.c
+++ b/util/res.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.17  1997-09-09 13:38:19  adam
+ * 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
+ * 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
@@ -102,12 +118,12 @@ 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)
     {
-        line = fgets (fr_buf, 1023, fr);
+        line = fgets (fr_buf, sizeof(fr_buf)-1, fr);
         if (!line)
             break;
         if (*line == '#')
@@ -130,21 +146,21 @@ static void reread (Res r)
             {
                 if (fr_buf[no] == 0 || fr_buf[no] == '\n' )
                 {
-                    no = -1;
+                    no = 0;
                     break;
                 }
-                if (fr_buf[no] == ':')
+                if (strchr (": \t", fr_buf[no]))
                     break;
                 no++;
             }
-            if (no < 0)
+            if (!no)
                 continue;
             fr_buf[no++] = '\0';
             resp = add_entry (r);
             resp->name = xmalloc (no);
             strcpy (resp->name, fr_buf);
             
-            while (fr_buf[no] == ' ')
+            while (strchr (" \t", fr_buf[no]))
                 no++;
             val_size = 0;
             while (1)
@@ -164,7 +180,7 @@ static void reread (Res r)
                 }
                 else if (fr_buf[no] == '\\' && fr_buf[no+1] == '\n')
                 {
-                    line = fgets (fr_buf, 1023, fr);
+                    line = fgets (fr_buf, sizeof(fr_buf)-1, fr);
                     if (!line)
                     {
                         resp->value = xmalloc (val_size);
@@ -201,7 +217,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;
@@ -225,6 +244,7 @@ void res_close (Res r)
             xfree (re);
         }
     }
+    xfree (r->name);
     xfree (r);
 }
 
@@ -282,12 +302,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 (*f)(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);
@@ -296,7 +317,11 @@ void res_trav (Res r, const char *prefix,
     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);
+		no++;
+	    }
+    return no;
 }