Changed log message.

[idzebra-moved-to-github.git] / util / res.c

diff --git a/util/res.c b/util/res.c
index deb1785..4e25261 100644 (file)
--- a/util/res.c
+++ b/util/res.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.18  1997-09-17 12:19:24  adam
+ * 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.
  *
@@ -111,7 +117,7 @@ static void reread (Res r)
     }
     while (1)
     {
-        line = fgets (fr_buf, 1023, fr);
+        line = fgets (fr_buf, sizeof(fr_buf)-1, fr);
         if (!line)
             break;
         if (*line == '#')
@@ -134,21 +140,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)
@@ -168,7 +174,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);
@@ -229,6 +235,7 @@ void res_close (Res r)
             xfree (re);
         }
     }
+    xfree (r->name);
     xfree (r);
 }