X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Freadconf.c;h=ce2853697bbbf37dd62398a66b81b70545259f05;hb=b0ea0712dd81e2d3dd25ec14c0bb9a6ce0a51056;hp=362b5968eb549664f53bece7b0976455da803783;hpb=db9513f9eca4ef13d3cea779a695bb822fd973a9;p=yaz-moved-to-github.git

diff --git a/util/readconf.c b/util/readconf.c
index 362b596..ce28536 100644
--- a/util/readconf.c
+++ b/util/readconf.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994-1998, Index Data
+ * Copyright (C) 1994-2000, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: readconf.c,v $
- * Revision 1.6  1998-10-13 16:09:55  adam
+ * Revision 1.10  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.9  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.8  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.7  1999/06/30 09:10:32  adam
+ * Fixed reading of MS-DOS files.
+ *
+ * Revision 1.6  1998/10/13 16:09:55  adam
  * Added support for arbitrary OID's for tagsets, schemas and attribute sets.
  * Added support for multiple attribute set references and tagset references
  * from an abstract syntax file.
@@ -36,14 +48,17 @@
  *
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
 
-#include <log.h>
-#include <readconf.h>
+#include <yaz/log.h>
+#include <yaz/readconf.h>
 
-#define l_isspace(c) ((c) == '\t' || (c) == ' ' || (c) == '\n')
+#define l_isspace(c) ((c) == '\t' || (c) == ' ' || (c) == '\n' || (c) == '\r')
 
 int readconf_line(FILE *f, int *lineno, char *line, int len,
 		  char *argv[], int num)
@@ -92,7 +107,7 @@ int readconf(char *name, void *rprivate,
     
     if (!(f = fopen(name, "r")))
     {
-	logf(LOG_WARN|LOG_ERRNO, "readconf: %s", name);
+	yaz_log(LOG_WARN|LOG_ERRNO, "readconf: %s", name);
 	return -1;
     }
     for (;;)