Update doc/common

[yaz-moved-to-github.git] / src / readconf.c

diff --git a/src/readconf.c b/src/readconf.c
index 60f7486..2c444f5 100644 (file)
--- a/src/readconf.c
+++ b/src/readconf.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 
@@ -13,7 +13,6 @@
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 
 #include <yaz/log.h>
 #include <yaz/readconf.h>
@@ -25,7 +24,7 @@ int readconf_line(FILE *f, int *lineno, char *line, int len,
 {
     char *p;
     int argc;
-    
+
     while ((p = fgets(line, len, f)))
     {
         (*lineno)++;
@@ -36,8 +35,8 @@ int readconf_line(FILE *f, int *lineno, char *line, int len,
     }
     if (!p)
         return 0;
-    
-    for (argc = 0; *p ; argc++)
+
+    for (argc = 0; *p && argc < num ; argc++)
     {
         if (*p == '#')  /* trailing comment */
             break;
@@ -64,7 +63,7 @@ int readconf(char *name, void *rprivate,
     char line[512], *m_argv[50];
     int m_argc;
     int lineno = 0;
-    
+
     if (!(f = fopen(name, "r")))
     {
         yaz_log(YLOG_WARN|YLOG_ERRNO, "readconf: %s", name);
@@ -73,7 +72,7 @@ int readconf(char *name, void *rprivate,
     for (;;)
     {
         int res;
-        
+
         if (!(m_argc = readconf_line(f, &lineno, line, 512, m_argv, 50)))
         {
             fclose(f);
@@ -90,6 +89,7 @@ int readconf(char *name, void *rprivate,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab