X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Freadconf.c;h=2c444f5a56b4062fd24028edded3d8c6e4c25019;hp=264ea7a7426a58408f993fe7f155b636bdb9fa35;hb=0d6f3ee9720647761ff74414a46828c0b9711ac0;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c diff --git a/src/readconf.c b/src/readconf.c index 264ea7a..2c444f5 100644 --- a/src/readconf.c +++ b/src/readconf.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ @@ -13,7 +13,6 @@ #endif #include -#include #include #include @@ -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);