[or-cvs] Miscellaneous bug fixes / activated "make check" for src/or

[montrose at seul.org]

Update of /home/or/cvsroot/src/common
In directory moria.seul.org:/tmp/cvs-serv4792/src/common

Modified Files:
	config.c 
Log Message:
Miscellaneous bug fixes / activated "make check" for src/or


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/common/config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.c	3 Jul 2002 16:31:22 -0000	1.3
+++ config.c	9 Jul 2002 19:51:41 -0000	1.4
@@ -8,6 +8,9 @@
 /*
  * Changes :
  * $Log$
+ * Revision 1.4  2002/07/09 19:51:41  montrose
+ * Miscellaneous bug fixes / activated "make check" for src/or
+ *
  * Revision 1.3  2002/07/03 16:31:22  montrose
  * Added getoptions() and made minor adjustment to poptReadDefaultOptions()
  *
@@ -361,19 +364,17 @@
 **/
 {
    FILE *fp;
-   int argc, c;
+   int argc, c, n;
    char **argv;
    char line[1024];
    line[0] = line[1] = '-';  /* prepend expected long name option flag */
-   fp = open_config(fname);
+   fp = fopen(fname,"r");
    if ( fp == NULL ) return INT_MIN;
    c = 0;
-   /**
-   this loop skips over all leading whitespace and blank lines then returns all text
-   from that point to the next newline.
-   **/
-   while ( c >= -1 && fscanf(fp,"%*[ \n]%[^\n]",&line[2]) == 1 )
+   while ( c >= -1 )
    {
+      if ( fscanf(fp,"%*[ \n]%n",&n) == EOF ) break;     /* eat leading whitespace */
+      if ( fscanf(fp, "%[^\n]",&line[2]) == EOF ) break; /* read a line */
       switch ( line[2] )
       {
       case '#':   /* comments begin with this */
@@ -386,7 +387,7 @@
          c = poptGetNextOpt(optCon);                  /* interpret option read from config file */
       }
    }
-   close_config(fp);
+   fclose(fp);
    return c;
 }