projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Character '.' matches any single character.
[yaz-moved-to-github.git]
/
util
/
readconf.c
diff --git
a/util/readconf.c
b/util/readconf.c
index
362b596
..
a4d4f64
100644
(file)
--- a/
util/readconf.c
+++ b/
util/readconf.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (C) 1994-1998, Index Data
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: readconf.c,v $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: readconf.c,v $
- * Revision 1.6 1998-10-13 16:09:55 adam
+ * 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.
* 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.
@@
-43,7
+49,7
@@
#include <log.h>
#include <readconf.h>
#include <log.h>
#include <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)
int readconf_line(FILE *f, int *lineno, char *line, int len,
char *argv[], int num)
@@
-92,7
+98,7
@@
int readconf(char *name, void *rprivate,
if (!(f = fopen(name, "r")))
{
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 (;;)
return -1;
}
for (;;)